Bug 1382754 - Export Screenshots version 10.8.0 to Firefox; r=mossop

MozReview-Commit-ID: 40PIhQ6SIDi

--HG--
extra : rebase_source : f75c1ee743708ead86a4976d624ec046fc93df4c

browser/extensions/screenshots/install.rdf

@@ -12,7 +12,7 @@
       </Description>
     </em:targetApplication>
     <em:type>2</em:type>
-    <em:version>10.7.0</em:version>
+    <em:version>10.8.0</em:version>
     <em:bootstrap>true</em:bootstrap>
     <em:homepageURL>https://pageshot.net/</em:homepageURL>
     <em:multiprocessCompatible>true</em:multiprocessCompatible>

browser/extensions/screenshots/webextension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Firefox Screenshots",
-  "version": "10.7.0",
+  "version": "10.8.0",
   "description": "__MSG_addonDescription__",
   "author": "__MSG_addonAuthorsList__",
   "homepage_url": "https://github.com/mozilla-services/screenshots",

browser/extensions/screenshots/webextension/onboarding/slides.js

@@ -96,7 +96,7 @@ this.slides = (function() {
     };
     let linkUrls = {
       [termsSentinel]: "https://www.mozilla.org/about/legal/terms/services/",
-      [privacySentinel]: "https://www.mozilla.org/privacy/firefox-cloud/"
+      [privacySentinel]: "https://www.mozilla.org/privacy/firefox/"
     };
     let text = browser.i18n.getMessage(
       "termsAndPrivacyNoticeCloudServices",

browser/extensions/screenshots/webextension/selector/ui.js

@@ -164,7 +164,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
     initSizeWatch() {
       this.stopSizeWatch();
       this.sizeTracking.timer = setInterval(watchFunction(this.updateElementSize.bind(this)), 2000);
-      window.addEventListener("resize", watchFunction(assertIsTrusted(this.onResize)), true);
+      window.addEventListener("resize", this.onResize, true);
     },
 
     stopSizeWatch() {
@@ -177,7 +177,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
         this.sizeTracking.windowDelayer = null;
       }
       this.sizeTracking.lastHeight = this.sizeTracking.lastWidth = null;
-      window.removeEventListener("resize", watchFunction(assertIsTrusted(this.onResize)), true);
+      window.removeEventListener("resize", this.onResize, true);
     },
 
     getElementFromPoint(x, y) {
@@ -198,7 +198,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
     }
   };
 
-  iframeSelection.onResize = watchFunction(assertIsTrusted(onResize.bind(iframeSelection)));
+  iframeSelection.onResize = watchFunction(assertIsTrusted(onResize.bind(iframeSelection)), true);
 
   let iframePreSelection = exports.iframePreSelection = {
     element: null,
@@ -322,7 +322,7 @@ this.ui = (function() { // eslint-disable-line no-unused-vars
     }
   };
 
-  iframePreSelection.onResize = watchFunction(onResize.bind(iframePreSelection));
+  iframePreSelection.onResize = watchFunction(onResize.bind(iframePreSelection), true);
 
   let iframe = exports.iframe = {
     currentIframe: iframePreSelection,