Merge pull request #4925 from yurydelendik/protdisable

Protects PDFJS.disableXXX == true from change
mozilla · Jun 12, 2014 · a75b685 · a75b685
2 parents b37b338 + 3b405cf
commit a75b685
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/web/viewer.js b/web/viewer.js
@@ -223,21 +223,33 @@ var PDFView = {
 
     var initializedPromise = Promise.all([
       Preferences.get('enableWebGL').then(function resolved(value) {
+        if (PDFJS.disableWebGL === true) {
+          return;
+        }
         PDFJS.disableWebGL = !value;
       }),
       Preferences.get('sidebarViewOnLoad').then(function resolved(value) {
         self.preferenceSidebarViewOnLoad = value;
       }),
       Preferences.get('disableTextLayer').then(function resolved(value) {
+        if (PDFJS.disableTextLayer === true) {
+          return;
+        }
         PDFJS.disableTextLayer = value;
       }),
       Preferences.get('disableRange').then(function resolved(value) {
+        if (PDFJS.disableRange === true) {
+          return;
+        }
         PDFJS.disableRange = value;
       }),
       Preferences.get('disableAutoFetch').then(function resolved(value) {
         PDFJS.disableAutoFetch = value;
       }),
       Preferences.get('disableFontFace').then(function resolved(value) {
+        if (PDFJS.disableFontFace === true) {
+          return;
+        }
         PDFJS.disableFontFace = value;
       }),
       Preferences.get('useOnlyCssZoom').then(function resolved(value) {