[Pkg-javascript-commits] [pdf.js] 100/204: Merge branch 'issue-4954' of https://github.com/Snuffleupagus/pdf.js into hashes

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository pdf.js.

commit 63b7fa563493d0dd27bd63aa132e0b1e1674b6ad
Merge: f6e2167 3ead6e6
Author: Yury Delendik <ydelendik at mozilla.com>
Date:   Fri Sep 19 18:25:11 2014 -0500

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

 extensions/firefox/content/PdfStreamConverter.jsm |   3 -
 web/default_preferences.js                        |   1 +
 web/viewer.js                                     | 146 +++++++++++-----------
 3 files changed, 73 insertions(+), 77 deletions(-)

diff --cc web/viewer.js
index 2a0b8e8,b2e8264..7828db2
--- a/web/viewer.js
+++ b/web/viewer.js
@@@ -1765,60 -1732,81 +1768,81 @@@ function webViewerInitialized() 
  //document.getElementById('secondaryOpenFile').setAttribute('hidden', 'true');
  //#endif
  
-   // Special debugging flags in the hash section of the URL.
-   var hash = document.location.hash.substring(1);
-   var hashParams = PDFView.parseQueryString(hash);
- 
-   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 !(FIREFOX || MOZCENTRAL)
+   var locale = PDFJS.locale || navigator.language;
+ //#endif
  
  //#if !PRODUCTION
-   if ('disablebcmaps' in hashParams && hashParams['disablebcmaps']) {
-     PDFJS.cMapUrl = '../external/cmaps/';
-     PDFJS.cMapPacked = false;
-   }
+   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);
  
- 
 -    if ('disableWorker' in hashParams) {
 -      PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
++    if ('disableworker' in hashParams) {
++      PDFJS.disableWorker = (hashParams['disableworker'] === 'true');
+     }
 -    if ('disableRange' in hashParams) {
 -      PDFJS.disableRange = (hashParams['disableRange'] === 'true');
++    if ('disablerange' in hashParams) {
++      PDFJS.disableRange = (hashParams['disablerange'] === 'true');
+     }
 -    if ('disableAutoFetch' in hashParams) {
 -      PDFJS.disableAutoFetch = (hashParams['disableAutoFetch'] === 'true');
++    if ('disableautofetch' in hashParams) {
++      PDFJS.disableAutoFetch = (hashParams['disableautofetch'] === 'true');
+     }
 -    if ('disableFontFace' in hashParams) {
 -      PDFJS.disableFontFace = (hashParams['disableFontFace'] === 'true');
++    if ('disablefontface' in hashParams) {
++      PDFJS.disableFontFace = (hashParams['disablefontface'] === 'true');
+     }
 -    if ('disableHistory' in hashParams) {
 -      PDFJS.disableHistory = (hashParams['disableHistory'] === '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 ('useonlycsszoom' in hashParams) {
++      PDFJS.useOnlyCssZoom = (hashParams['useonlycsszoom'] === 'true');
+     }
+     if ('verbosity' in hashParams) {
+       PDFJS.verbosity = hashParams['verbosity'] | 0;
+     }
 -    if ('ignoreCurrentPositionOnZoom' in hashParams) {
++    if ('ignorecurrentpositiononzoom' in hashParams) {
+       IGNORE_CURRENT_POSITION_ON_ZOOM =
 -        (hashParams['ignoreCurrentPositionOnZoom'] === 'true');
++        (hashParams['ignorecurrentpositiononzoom'] === 'true');
+     }
+ //#if !PRODUCTION
 -    if ('disableBcmaps' in hashParams && hashParams['disableBcmaps']) {
++    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'];
+     if ('locale' in hashParams) {
+       locale = hashParams['locale'];
+     }
+ //#endif
 -    if ('textLayer' in hashParams) {
 -      switch (hashParams['textLayer']) {
++    if ('textlayer' in hashParams) {
++      switch (hashParams['textlayer']) {
+         case 'off':
+           PDFJS.disableTextLayer = true;
+           break;
+         case 'visible':
+         case 'shadow':
+         case 'hover':
+           var viewer = document.getElementById('viewer');
 -          viewer.classList.add('textLayer-' + hashParams['textLayer']);
++          viewer.classList.add('textLayer-' + hashParams['textlayer']);
+           break;
+       }
+     }
 -    if ('pdfBug' in hashParams) {
++    if ('pdfbug' in hashParams) {
+       PDFJS.pdfBug = true;
 -      var pdfBug = hashParams['pdfBug'];
++      var pdfBug = hashParams['pdfbug'];
+       var enabled = pdfBug.split(',');
+       PDFBug.enable(enabled);
+       PDFBug.init();
+     }
    }
+ 
+ //#if !(FIREFOX || MOZCENTRAL)
    mozL10n.setLanguage(locale);
  //#endif
  //#if (FIREFOX || MOZCENTRAL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git