Merge branch 'issue-4954' of https://github.com/Snuffleupagus/pdf.js into hashes

Conflicts:
	web/viewer.js

extensions/firefox/content/PdfStreamConverter.jsm

@@ -344,9 +344,6 @@ ChromeActions.prototype = {
       return 'null';
     }
   },
-  pdfBugEnabled: function() {
-    return getBoolPref(PREF_PREFIX + '.pdfBugEnabled', false);
-  },
   supportsIntegratedFind: function() {
     // Integrated find is only supported when we're not in a frame
     if (this.domWindow.frameElement !== null) {

web/default_preferences.js

@@ -26,6 +26,7 @@ var DEFAULT_PREFERENCES = {
   sidebarViewOnLoad: 0,
   enableHandToolOnLoad: false,
   enableWebGL: false,
+  pdfBugEnabled: false,
   disableRange: false,
   disableAutoFetch: false,
   disableFontFace: false,

web/viewer.js

@@ -233,6 +233,9 @@ var PDFView = {
       Preferences.get('sidebarViewOnLoad').then(function resolved(value) {
         self.preferenceSidebarViewOnLoad = value;
       }),
+      Preferences.get('pdfBugEnabled').then(function resolved(value) {
+        self.preferencesPdfBugEnabled = value;
+      }),
       Preferences.get('disableTextLayer').then(function resolved(value) {
         if (PDFJS.disableTextLayer === true) {
           return;
@@ -1765,6 +1768,15 @@ function webViewerInitialized() {
 //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
 //#endif
 
+//#if !(FIREFOX || MOZCENTRAL)
+  var locale = PDFJS.locale || navigator.language;
+//#endif
+
+//#if !PRODUCTION
+  if (true) {
+//#else
+//if (PDFView.preferencesPdfBugEnabled) {
+//#endif
     // Special debugging flags in the hash section of the URL.
     var hash = document.location.hash.substring(1);
     var hashParams = PDFView.parseQueryString(hash);
@@ -1772,63 +1784,42 @@ function webViewerInitialized() {
     if ('disableworker' in hashParams) {
       PDFJS.disableWorker = (hashParams['disableworker'] === 'true');
     }
-
     if ('disablerange' in hashParams) {
       PDFJS.disableRange = (hashParams['disablerange'] === 'true');
     }
-
     if ('disableautofetch' in hashParams) {
       PDFJS.disableAutoFetch = (hashParams['disableautofetch'] === 'true');
     }
-
     if ('disablefontface' in hashParams) {
       PDFJS.disableFontFace = (hashParams['disablefontface'] === 'true');
     }
-
     if ('disablehistory' in hashParams) {
       PDFJS.disableHistory = (hashParams['disablehistory'] === 'true');
     }
-
     if ('webgl' in hashParams) {
       PDFJS.disableWebGL = (hashParams['webgl'] !== 'true');
     }
-
     if ('useonlycsszoom' in hashParams) {
       PDFJS.useOnlyCssZoom = (hashParams['useonlycsszoom'] === 'true');
     }
-
     if ('verbosity' in hashParams) {
       PDFJS.verbosity = hashParams['verbosity'] | 0;
     }
-
     if ('ignorecurrentpositiononzoom' in hashParams) {
       IGNORE_CURRENT_POSITION_ON_ZOOM =
         (hashParams['ignorecurrentpositiononzoom'] === 'true');
     }
-
 //#if !PRODUCTION
     if ('disablebcmaps' in hashParams && hashParams['disablebcmaps']) {
       PDFJS.cMapUrl = '../external/cmaps/';
       PDFJS.cMapPacked = false;
     }
 //#endif
-
-
 //#if !(FIREFOX || MOZCENTRAL)
-  var locale = PDFJS.locale || navigator.language;
     if ('locale' in hashParams) {
       locale = hashParams['locale'];
     }
-  mozL10n.setLanguage(locale);
 //#endif
-//#if (FIREFOX || MOZCENTRAL)
-//if (!PDFView.supportsDocumentFonts) {
-//  PDFJS.disableFontFace = true;
-//  console.warn(mozL10n.get('web_fonts_disabled', null,
-//    'Web fonts are disabled: unable to use embedded PDF fonts.'));
-//}
-//#endif
-
     if ('textlayer' in hashParams) {
       switch (hashParams['textlayer']) {
         case 'off':
@@ -1842,18 +1833,25 @@ function webViewerInitialized() {
           break;
       }
     }
-
-//#if !(FIREFOX || MOZCENTRAL)
     if ('pdfbug' in hashParams) {
-//#else
-//if ('pdfBug' in hashParams && FirefoxCom.requestSync('pdfBugEnabled')) {
-//#endif
       PDFJS.pdfBug = true;
       var pdfBug = hashParams['pdfbug'];
       var enabled = pdfBug.split(',');
       PDFBug.enable(enabled);
       PDFBug.init();
     }
+  }
+
+//#if !(FIREFOX || MOZCENTRAL)
+  mozL10n.setLanguage(locale);
+//#endif
+//#if (FIREFOX || MOZCENTRAL)
+//if (!PDFView.supportsDocumentFonts) {
+//  PDFJS.disableFontFace = true;
+//  console.warn(mozL10n.get('web_fonts_disabled', null,
+//    'Web fonts are disabled: unable to use embedded PDF fonts.'));
+//}
+//#endif
 
   if (!PDFView.supportsPrinting) {
     document.getElementById('print').classList.add('hidden');