Bug 1382754 - Export Screenshots version 10.8.0 to Firefox; r?kmag
MozReview-Commit-ID: 40PIhQ6SIDi
--- a/browser/extensions/screenshots/install.rdf
+++ b/browser/extensions/screenshots/install.rdf
@@ -7,14 +7,14 @@
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!--Firefox-->
<em:minVersion>51.0a1</em:minVersion>
<em:maxVersion>*</em:maxVersion>
</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>
</Description>
</RDF>
--- a/browser/extensions/screenshots/webextension/manifest.json
+++ b/browser/extensions/screenshots/webextension/manifest.json
@@ -1,12 +1,12 @@
{
"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",
"applications": {
"gecko": {
"id": "screenshots@mozilla.org"
}
},
--- a/browser/extensions/screenshots/webextension/onboarding/slides.js
+++ b/browser/extensions/screenshots/webextension/onboarding/slides.js
@@ -91,17 +91,17 @@ this.slides = (function() {
let privacySentinel = "__PRIVACY__";
let sentinelSplitter = "!!!";
let linkTexts = {
[termsSentinel]: browser.i18n.getMessage("termsAndPrivacyNoticeTermsLink"),
[privacySentinel]: browser.i18n.getMessage("termsAndPrivacyNoticyPrivacyLink")
};
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",
[sentinelSplitter + termsSentinel + sentinelSplitter,
sentinelSplitter + privacySentinel + sentinelSplitter]);
let parts = text.split(sentinelSplitter);
for (let part of parts) {
let el;
--- a/browser/extensions/screenshots/webextension/selector/ui.js
+++ b/browser/extensions/screenshots/webextension/selector/ui.js
@@ -159,30 +159,30 @@ this.ui = (function() { // eslint-disabl
if (force && visible) {
this.element.style.display = "";
}
},
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() {
if (this.sizeTracking.timer) {
clearTimeout(this.sizeTracking.timer);
this.sizeTracking.timer = null;
}
if (this.sizeTracking.windowDelayer) {
clearTimeout(this.sizeTracking.windowDelayer);
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) {
this.element.style.pointerEvents = "none";
let el;
try {
el = document.elementFromPoint(x, y);
} finally {
@@ -193,17 +193,17 @@ this.ui = (function() { // eslint-disabl
remove() {
this.stopSizeWatch();
util.removeNode(this.element);
this.element = this.document = null;
}
};
- iframeSelection.onResize = watchFunction(assertIsTrusted(onResize.bind(iframeSelection)));
+ iframeSelection.onResize = watchFunction(assertIsTrusted(onResize.bind(iframeSelection)), true);
let iframePreSelection = exports.iframePreSelection = {
element: null,
document: null,
sizeTracking: {
windowDelayer: null
},
display(installHandlerOnDocument, standardOverlayCallbacks) {
@@ -317,17 +317,17 @@ this.ui = (function() { // eslint-disabl
remove() {
this.hide();
util.removeNode(this.element);
this.element = null;
this.document = null;
}
};
- iframePreSelection.onResize = watchFunction(onResize.bind(iframePreSelection));
+ iframePreSelection.onResize = watchFunction(onResize.bind(iframePreSelection), true);
let iframe = exports.iframe = {
currentIframe: iframePreSelection,
display(installHandlerOnDocument, standardOverlayCallbacks) {
return iframeSelection.display(installHandlerOnDocument)
.then(() => iframePreSelection.display(installHandlerOnDocument, standardOverlayCallbacks));
},