fix JS errors about disabled stuff
This commit is contained in:
parent
14b80b7c70
commit
a0e84877ff
@ -14,11 +14,12 @@ let
|
|||||||
./disable-datasharing-infobar.patch
|
./disable-datasharing-infobar.patch
|
||||||
./disable-locationservice.patch
|
./disable-locationservice.patch
|
||||||
./disable-sponsored-tiles.patch
|
./disable-sponsored-tiles.patch
|
||||||
|
./disable-send-to-device.patch
|
||||||
./disable-system-addons.patch
|
./disable-system-addons.patch
|
||||||
./disable-telemetry.patch
|
./disable-telemetry.patch
|
||||||
./disable-reader.patch
|
./disable-reader.patch
|
||||||
./disable-pocket.patch
|
./disable-pocket.patch
|
||||||
./disable-send-to-device.patch
|
./disable-pdfjs.patch
|
||||||
./disable-dbus.patch
|
./disable-dbus.patch
|
||||||
./preferences.patch
|
./preferences.patch
|
||||||
];
|
];
|
||||||
|
41
disable-pdfjs.patch
Normal file
41
disable-pdfjs.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
--- a/browser/components/nsBrowserGlue.js
|
||||||
|
+++ b/browser/components/nsBrowserGlue.js
|
||||||
|
@@ -47,7 +47,6 @@
|
||||||
|
OS: "resource://gre/modules/osfile.jsm",
|
||||||
|
PageActions: "resource:///modules/PageActions.jsm",
|
||||||
|
PageThumbs: "resource://gre/modules/PageThumbs.jsm",
|
||||||
|
- PdfJs: "resource://pdf.js/PdfJs.jsm",
|
||||||
|
PermissionUI: "resource:///modules/PermissionUI.jsm",
|
||||||
|
PingCentre: "resource:///modules/PingCentre.jsm",
|
||||||
|
PlacesBackups: "resource://gre/modules/PlacesBackups.jsm",
|
||||||
|
@@ -505,14 +504,6 @@
|
||||||
|
this._updateFxaBadges();
|
||||||
|
break;
|
||||||
|
case "handlersvc-store-initialized":
|
||||||
|
- // Initialize PdfJs when running in-process and remote. This only
|
||||||
|
- // happens once since PdfJs registers global hooks. If the PdfJs
|
||||||
|
- // extension is installed the init method below will be overridden
|
||||||
|
- // leaving initialization to the extension.
|
||||||
|
- // parent only: configure default prefs, set up pref observers, register
|
||||||
|
- // pdf content handler, and initializes parent side message manager
|
||||||
|
- // shim for privileged api access.
|
||||||
|
- PdfJs.init(true);
|
||||||
|
break;
|
||||||
|
case "shield-init-complete":
|
||||||
|
this._sendMainPingCentrePing();
|
||||||
|
@@ -866,15 +857,6 @@
|
||||||
|
|
||||||
|
// the first browser window has finished initializing
|
||||||
|
_onFirstWindowLoaded: function BG__onFirstWindowLoaded(aWindow) {
|
||||||
|
- // Set up listeners and, if PdfJs is enabled, register the PDF stream converter.
|
||||||
|
- // We delay all of the parent's initialization other than stream converter
|
||||||
|
- // registration, because it requires file IO from nsHandlerService-json.js
|
||||||
|
- Services.ppmm.loadProcessScript("resource://pdf.js/pdfjschildbootstrap.js", true);
|
||||||
|
- if (PdfJs.enabled) {
|
||||||
|
- PdfJs.ensureRegistered();
|
||||||
|
- Services.ppmm.loadProcessScript("resource://pdf.js/pdfjschildbootstrap-enabled.js", true);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
TabCrashHandler.init();
|
||||||
|
if (AppConstants.MOZ_CRASHREPORTER) {
|
||||||
|
PluginCrashReporter.init();
|
@ -222,8 +222,8 @@
|
|||||||
[browser_sessionHistory.js]
|
[browser_sessionHistory.js]
|
||||||
support-files =
|
support-files =
|
||||||
file_sessionHistory_hashchange.html
|
file_sessionHistory_hashchange.html
|
||||||
--- a/browser/base/content/urlbarBindings.xml 2017-11-02
|
--- a/browser/base/content/urlbarBindings.xml
|
||||||
+++ b/browser/base/content/urlbarBindings.xml 2017-11-24
|
+++ b/browser/base/content/urlbarBindings.xml
|
||||||
@@ -230,11 +230,6 @@
|
@@ -230,11 +230,6 @@
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -263,6 +263,15 @@
|
|||||||
<method name="_getSelectedValueForClipboard">
|
<method name="_getSelectedValueForClipboard">
|
||||||
<body><![CDATA[
|
<body><![CDATA[
|
||||||
// Grab the actual input field's value, not our value, which could include moz-action:
|
// Grab the actual input field's value, not our value, which could include moz-action:
|
||||||
|
@@ -1008,8 +983,6 @@
|
||||||
|
return selectedVal;
|
||||||
|
}
|
||||||
|
|
||||||
|
- uri = this.makeURIReadable(uri);
|
||||||
|
-
|
||||||
|
// If the entire URL is selected, just use the actual loaded URI,
|
||||||
|
// unless we want a decoded URI, or it's a data: or javascript: URI,
|
||||||
|
// since those are hard to read when encoded.
|
||||||
--- a/browser/modules/moz.build
|
--- a/browser/modules/moz.build
|
||||||
+++ b/browser/modules/moz.build
|
+++ b/browser/modules/moz.build
|
||||||
@@ -85,9 +85,6 @@
|
@@ -85,9 +85,6 @@
|
||||||
|
Loading…
Reference in New Issue
Block a user