fix JS errors about disabled stuff

2017-11-24 23:49:08 +01:00 · 2017-11-24 23:49:08 +01:00 · a0e84877ff
commit a0e84877ff
parent 14b80b7c70
3 changed files with 54 additions and 3 deletions
--- a/default.nix
+++ b/default.nix
@ -14,11 +14,12 @@ let
      ./disable-datasharing-infobar.patch
      ./disable-locationservice.patch
      ./disable-sponsored-tiles.patch
+      ./disable-send-to-device.patch
      ./disable-system-addons.patch
      ./disable-telemetry.patch
      ./disable-reader.patch
      ./disable-pocket.patch
-      ./disable-send-to-device.patch
+      ./disable-pdfjs.patch
      ./disable-dbus.patch
      ./preferences.patch
    ];
--- a/disable-pdfjs.patch
+++ b/disable-pdfjs.patch
@ -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();
--- a/disable-reader.patch
+++ b/disable-reader.patch
@ -222,8 +222,8 @@
 [browser_sessionHistory.js]
 support-files =
   file_sessionHistory_hashchange.html
--- a/browser/base/content/urlbarBindings.xml	2017-11-02
-+++ b/browser/base/content/urlbarBindings.xml	2017-11-24
+--- a/browser/base/content/urlbarBindings.xml
+++ b/browser/base/content/urlbarBindings.xml
@@ -230,11 +230,6 @@
                 break;
               }
@ -263,6 +263,15 @@
       <method name="_getSelectedValueForClipboard">
         <body><![CDATA[
           // 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
 +++ b/browser/modules/moz.build
@@ -85,9 +85,6 @@