add catch handlers and use PromiseEmitter pattern in visualize and di…

…scover. Closes #188
elastic · Jul 22, 2014 · b25291f · b25291f
1 parent b6647d9
commit b25291f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/kibana/apps/discover/controllers/discover.js b/src/kibana/apps/discover/controllers/discover.js
@@ -162,12 +162,10 @@ define(function (require) {
           timefilter.enabled(!!timefield);
         });
 
-        $scope.searchSource.onError().then(function searchError(err) {
+        $scope.searchSource.onError(function (err) {
           console.log(err);
           notify.error('An error occured with your request. Reset your inputs and try again.');
-
-          return $scope.searchSource.onError().then(searchError);
-        });
+        }).catch(notify.fatal);
 
         // Bind a result handler. Any time searchSource.fetch() is executed this gets called
         // with the results

diff --git a/src/kibana/apps/visualize/directives/visualize.js b/src/kibana/apps/visualize/directives/visualize.js
@@ -101,7 +101,7 @@ define(function (require) {
             render();
           }).catch(notify.fatal);
 
-          vis.searchSource.onError(notify.error);
+          vis.searchSource.onError(notify.error).catch(notify.fatal);
 
           $scope.$root.$broadcast('ready:vis');
         });