Add a quiet parameter to watchFunction to match watchPromise (#2795)

Quiet the watchFunction calls in tabs.onUpdated and tabs.onActivated, that should never pop up a message
mozilla-services · May 2, 2017 · 1add819 · 1add819
1 parent 126fc0e
commit 1add819
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/addon/webextension/background/main.js b/addon/webextension/background/main.js
@@ -220,7 +220,7 @@ this.main = (function() {
         disableButton(tabId);
       }
     }), true);
-  }));
+  }, true));
 
   communication.register("sendEvent", (sender, ...args) => {
     catcher.watchPromise(sendEvent(...args));

diff --git a/addon/webextension/catcher.js b/addon/webextension/catcher.js
@@ -46,12 +46,14 @@ this.catcher = (function() {
   }
 
   /** Wrap the function, and if it raises any exceptions then call unhandled() */
-  exports.watchFunction = function watchFunction(func) {
+  exports.watchFunction = function watchFunction(func, quiet) {
     return function() {
       try {
         return func.apply(this, arguments);
       } catch (e) {
-        exports.unhandled(e);
+        if (!quiet) {
+          exports.unhandled(e);
+        }
         throw e;
       }
     };