firefox-patches/disable-pocket.patch
2017-11-24 23:18:39 +01:00

65 lines
2.9 KiB
Diff

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -200,7 +200,7 @@
pref("extensions.{972ce4c6-7e08-4474-a285-3208198ce6fd}.description", "chrome://browser/locale/browser.properties");
pref("extensions.webextensions.themes.enabled", true);
-pref("extensions.webextensions.themes.icons.buttons", "back,forward,reload,stop,bookmark_star,bookmark_menu,downloads,home,app_menu,cut,copy,paste,new_window,new_private_window,save_page,print,history,full_screen,find,options,addons,developer,synced_tabs,open_file,sidebars,share_page,subscribe,text_encoding,email_link,forget,pocket");
+pref("extensions.webextensions.themes.icons.buttons", "back,forward,reload,stop,bookmark_star,bookmark_menu,downloads,home,app_menu,cut,copy,paste,new_window,new_private_window,save_page,print,history,full_screen,find,options,addons,developer,synced_tabs,open_file,sidebars,share_page,subscribe,text_encoding,email_link,forget");
pref("lightweightThemes.update.enabled", true);
pref("lightweightThemes.getMoreURL", "https://addons.mozilla.org/%LOCALE%/firefox/themes");
@@ -1648,8 +1648,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
--- a/browser/components/uitour/UITour.jsm
+++ b/browser/components/uitour/UITour.jsm
@@ -147,18 +147,6 @@
["help", {query: "#appMenu-help-button"}],
["home", {query: "#home-button"}],
["library", {query: "#appMenu-library-button"}],
- ["pocket", {
- allowAdd: true,
- query: (aDocument) => {
- // The pocket's urlbar page action button is pre-defined in the DOM.
- // It would be hidden if toggled off from the urlbar.
- let node = aDocument.getElementById("pocket-button-box");
- if (node && node.hidden == false) {
- return node;
- }
- return aDocument.getElementById("pageAction-panel-pocket");
- },
- }],
["privateWindow", {query: "#appMenu-private-window-button"}],
["quit", {query: "#appMenu-quit-button"}],
["search", {
@@ -1427,12 +1415,6 @@
}
aWindow.document.getElementById("identity-box").click();
} else if (aMenuName == "pocket") {
- let pageAction = PageActions.actionForID("pocket");
- if (!pageAction) {
- log.error("Can't open the pocket menu without a page action");
- return;
- }
- pageAction.doCommand(aWindow);
} else if (aMenuName == "urlbar") {
this.getTarget(aWindow, "urlbar").then(target => {
let urlbar = target.node;
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -12,7 +12,6 @@
'formautofill',
'onboarding',
'pdfjs',
- 'pocket',
'screenshots',
'shield-recipe-client',
'webcompat',