Merge pull request #3011 from mozilla-services/2955-startup-errors

2955 startup errors
mozilla-services · Jun 12, 2017 · 4cbc17c · 4cbc17c
2 parents 7cfe335 + 9db01b7
commit 4cbc17c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/addon/webextension/background/senderror.js b/addon/webextension/background/senderror.js
@@ -2,6 +2,8 @@
 
 "use strict";
 
+const startTime = Date.now();
+
 this.senderror = (function() {
   let exports = {};
 
@@ -73,12 +75,14 @@ this.senderror = (function() {
         message = error.message;
       }
     }
-    browser.notifications.create(id, {
-      type: "basic",
-      // FIXME: need iconUrl for an image, see #2239
-      title,
-      message
-    });
+    if (Date.now() - startTime > 5 * 1000) {
+      browser.notifications.create(id, {
+        type: "basic",
+        // FIXME: need iconUrl for an image, see #2239
+        title,
+        message
+      });
+    }
   };
 
   exports.reportError = function(e) {

diff --git a/addon/webextension/manifest.json.template b/addon/webextension/manifest.json.template
@@ -34,8 +34,7 @@
         "catcher.js",
         "selector/callBackground.js",
         "sitehelper.js"
-      ],
-      "run_at": "document_start"
+      ]
     }
   ],
   "web_accessible_resources": [