summarylogtreecommitdiffstats
path: root/firefox-52-disable-pocket-leftovers.patch
diff options
context:
space:
mode:
Diffstat (limited to 'firefox-52-disable-pocket-leftovers.patch')
-rw-r--r--firefox-52-disable-pocket-leftovers.patch82
1 files changed, 82 insertions, 0 deletions
diff --git a/firefox-52-disable-pocket-leftovers.patch b/firefox-52-disable-pocket-leftovers.patch
new file mode 100644
index 000000000000..a6a0172dd6b3
--- /dev/null
+++ b/firefox-52-disable-pocket-leftovers.patch
@@ -0,0 +1,82 @@
+--- firefox-52.0esr.bak/browser/app/profile/firefox.js 2017-03-09
++++ firefox-52.0esr/browser/app/profile/firefox.js 2017-03-09
+@@ -1525,8 +1525,6 @@
+ // Enable browser frames for use on desktop. Only exposed to chrome callers.
+ pref("dom.mozBrowserFramesEnabled", true);
+
+-pref("extensions.pocket.enabled", true);
+-
+ pref("signon.schemeUpgrades", true);
+
+ // "Simplify Page" feature in Print Preview. This feature is disabled by default
+--- firefox-52.0esr.bak/browser/components/uitour/UITour.jsm 2017-03-09
++++ firefox-52.0esr/browser/components/uitour/UITour.jsm 2017-03-09
+@@ -154,11 +154,6 @@
+ query: "#panic-button",
+ widgetName: "panic-button",
+ }],
+- ["pocket", {
+- allowAdd: true,
+- query: "#pocket-button",
+- widgetName: "pocket-button",
+- }],
+ ["privateWindow", {query: "#privatebrowsing-button"}],
+ ["quit", {query: "#PanelUI-quit"}],
+ ["readerMode-urlBar", {query: "#reader-mode-button"}],
+@@ -1688,46 +1683,6 @@
+ popup.addEventListener("popupshown", onPopupShown);
+ }
+ aWindow.document.getElementById("identity-box").click();
+- } else if (aMenuName == "pocket") {
+- this.getTarget(aWindow, "pocket").then(Task.async(function* onPocketTarget(target) {
+- let widgetGroupWrapper = CustomizableUI.getWidget(target.widgetName);
+- if (widgetGroupWrapper.type != "view" || !widgetGroupWrapper.viewId) {
+- log.error("Can't open the pocket menu without a view");
+- return;
+- }
+- let placement = CustomizableUI.getPlacementOfWidget(target.widgetName);
+- if (!placement || !placement.area) {
+- log.error("Can't open the pocket menu without a placement");
+- return;
+- }
+-
+- if (placement.area == CustomizableUI.AREA_PANEL) {
+- // Open the appMenu and wait for it if it's not already opened or showing a subview.
+- yield new Promise((resolve, reject) => {
+- if (aWindow.PanelUI.panel.state != "closed") {
+- if (aWindow.PanelUI.multiView.showingSubView) {
+- reject("A subview is already showing");
+- return;
+- }
+-
+- resolve();
+- return;
+- }
+-
+- aWindow.PanelUI.panel.addEventListener("popupshown", function onShown() {
+- aWindow.PanelUI.panel.removeEventListener("popupshown", onShown);
+- resolve();
+- });
+-
+- aWindow.PanelUI.show();
+- });
+- }
+-
+- let widgetWrapper = widgetGroupWrapper.forWindow(aWindow);
+- aWindow.PanelUI.showSubView(widgetGroupWrapper.viewId,
+- widgetWrapper.anchor,
+- placement.area);
+- })).catch(log.error);
+ }
+ },
+
+--- firefox-52.0esr.bak/browser/extensions/moz.build 2017-03-09
++++ firefox-52.0esr/browser/extensions/moz.build 2017-03-09
+@@ -8,7 +8,6 @@
+ 'aushelper',
+ 'e10srollout',
+ 'pdfjs',
+- 'pocket',
+ 'webcompat',
+ ]
+