100 lines
4.3 KiB
Diff
100 lines
4.3 KiB
Diff
--- a/browser/base/content/browser.js
|
|
+++ b/browser/base/content/browser.js
|
|
@@ -71,7 +71,6 @@ XPCOMUtils.defineLazyGetter(this, "exten
|
|
["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"],
|
|
["PromiseUtils", "resource://gre/modules/PromiseUtils.jsm"],
|
|
["ReaderMode", "resource://gre/modules/ReaderMode.jsm"],
|
|
- ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
|
|
["RecentWindow", "resource:///modules/RecentWindow.jsm"],
|
|
["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
|
|
["ShortcutUtils", "resource://gre/modules/ShortcutUtils.jsm"],
|
|
@@ -4725,7 +4724,6 @@ var XULBrowserWindow = {
|
|
}
|
|
}
|
|
UpdateBackForwardCommands(gBrowser.webNavigation);
|
|
- ReaderParent.updateReaderButton(gBrowser.selectedBrowser);
|
|
|
|
gGestureSupport.restoreRotationState();
|
|
|
|
--- a/browser/base/content/browser-sets.inc
|
|
+++ b/browser/base/content/browser-sets.inc
|
|
@@ -48,7 +48,6 @@
|
|
<command id="View:PageSource" oncommand="BrowserViewSource(window.gBrowser.selectedBrowser);" observes="canViewSource"/>
|
|
<command id="View:PageInfo" oncommand="BrowserPageInfo();"/>
|
|
<command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
|
|
- <command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/>
|
|
<command id="cmd_find"
|
|
oncommand="gFindBar.onFindCommand();"
|
|
observes="isImage"/>
|
|
--- a/browser/base/content/browser.xul
|
|
+++ b/browser/base/content/browser.xul
|
|
@@ -902,10 +902,6 @@
|
|
hidden="true"
|
|
tooltiptext="&pageReportIcon.tooltip;"
|
|
onmousedown="gPopupBlockerObserver.onReportButtonMousedown(event);"/>
|
|
- <image id="reader-mode-button"
|
|
- class="urlbar-icon"
|
|
- hidden="true"
|
|
- onclick="ReaderParent.buttonClick(event);"/>
|
|
<toolbarbutton id="urlbar-zoom-button"
|
|
onclick="FullZoom.reset();"
|
|
tooltip="dynamic-shortcut-tooltip"
|
|
--- a/browser/components/nsBrowserGlue.js
|
|
+++ b/browser/components/nsBrowserGlue.js
|
|
@@ -83,7 +83,6 @@ let initializedModules = {};
|
|
["PluralForm", "resource://gre/modules/PluralForm.jsm"],
|
|
["PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"],
|
|
["ProcessHangMonitor", "resource:///modules/ProcessHangMonitor.jsm"],
|
|
- ["ReaderParent", "resource:///modules/ReaderParent.jsm"],
|
|
["RecentWindow", "resource:///modules/RecentWindow.jsm"],
|
|
["RemotePrompt", "resource:///modules/RemotePrompt.jsm"],
|
|
["SessionStore", "resource:///modules/sessionstore/SessionStore.jsm"],
|
|
@@ -156,9 +155,6 @@ const listeners = {
|
|
"FormValidation:ShowPopup": ["FormValidationHandler"],
|
|
"FormValidation:HidePopup": ["FormValidationHandler"],
|
|
"Prompt:Open": ["RemotePrompt"],
|
|
- "Reader:ArticleGet": ["ReaderParent"],
|
|
- "Reader:FaviconRequest": ["ReaderParent"],
|
|
- "Reader:UpdateReaderButton": ["ReaderParent"],
|
|
// PLEASE KEEP THIS LIST IN SYNC WITH THE LISTENERS ADDED IN LoginManagerParent.init
|
|
"RemoteLogins:findLogins": ["LoginManagerParent"],
|
|
"RemoteLogins:findRecipes": ["LoginManagerParent"],
|
|
--- a/browser/components/uitour/UITour.jsm
|
|
+++ b/browser/components/uitour/UITour.jsm
|
|
@@ -32,8 +32,6 @@ XPCOMUtils.defineLazyModuleGetter(this,
|
|
"resource://gre/modules/PrivateBrowsingUtils.jsm");
|
|
XPCOMUtils.defineLazyModuleGetter(this, "ProfileAge",
|
|
"resource://gre/modules/ProfileAge.jsm");
|
|
-XPCOMUtils.defineLazyModuleGetter(this, "ReaderParent",
|
|
- "resource:///modules/ReaderParent.jsm");
|
|
|
|
XPCOMUtils.defineLazyPreferenceGetter(this, "gPhotonStructure", "browser.photon.structure.enabled");
|
|
|
|
@@ -663,15 +661,10 @@ this.UITour = {
|
|
}
|
|
|
|
case "forceShowReaderIcon": {
|
|
- ReaderParent.forceShowReaderIcon(browser);
|
|
break;
|
|
}
|
|
|
|
case "toggleReaderMode": {
|
|
- let targetPromise = this.getTarget(window, "readerMode-urlBar");
|
|
- targetPromise.then(target => {
|
|
- ReaderParent.toggleReaderMode({target: target.node});
|
|
- });
|
|
break;
|
|
}
|
|
|
|
--- a/browser/modules/moz.build
|
|
+++ b/browser/modules/moz.build
|
|
@@ -150,7 +150,6 @@
|
|
'PermissionUI.jsm',
|
|
'PluginContent.jsm',
|
|
'ProcessHangMonitor.jsm',
|
|
- 'ReaderParent.jsm',
|
|
'RecentWindow.jsm',
|
|
'RemotePrompt.jsm',
|
|
'Sanitizer.jsm',
|
|
|