Move viewer specific compatibility options from src/shared/compatibility.js and into a separate file

Unfortunately, as far as I can tell, we still need the ability to adjust certain viewer options depending on the browser environment in PDF.js version `2.0`. However, we should be able to separate this from the general compatibility code in the `src/shared/compatibility.js` file.
This commit is contained in:
Jonas Jenwald 2018-02-13 12:24:33 +01:00
parent ea3d8450d2
commit 9e0a31f662
4 changed files with 48 additions and 44 deletions

View File

@ -26,12 +26,10 @@ if ((typeof PDFJSDev === 'undefined' ||
// users - https://github.com/mozilla/pdf.js/issues/9397 // users - https://github.com/mozilla/pdf.js/issues/9397
if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) { if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) {
var globalScope = require('./global_scope'); const globalScope = require('./global_scope');
const isNodeJS = require('./is_node'); const isNodeJS = require('./is_node');
var userAgent = (typeof navigator !== 'undefined' && navigator.userAgent) || ''; var userAgent = (typeof navigator !== 'undefined' && navigator.userAgent) || '';
var isAndroid = /Android/.test(userAgent);
var isIOSChrome = userAgent.indexOf('CriOS') >= 0; var isIOSChrome = userAgent.indexOf('CriOS') >= 0;
var isIE = userAgent.indexOf('Trident') >= 0; var isIE = userAgent.indexOf('Trident') >= 0;
var isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent); var isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
@ -80,18 +78,6 @@ PDFJS.compatibilityChecked = true;
} }
})(); })();
// Checks if navigator.language is supported
// Support: IE<11
(function checkNavigatorLanguage() {
if (typeof navigator === 'undefined') {
return;
}
if ('language' in navigator) {
return;
}
PDFJS.locale = navigator.userLanguage || 'en-US';
})();
// Support: Safari 6.0+, iOS // Support: Safari 6.0+, iOS
(function checkRangeRequests() { (function checkRangeRequests() {
// Safari has issues with cached range requests see: // Safari has issues with cached range requests see:
@ -103,25 +89,6 @@ PDFJS.compatibilityChecked = true;
} }
})(); })();
// Support: Android, iOS
(function checkCanvasSizeLimitation() {
if (isIOS || isAndroid) {
// 5MP
PDFJS.maxCanvasPixels = 5242880;
}
})();
// Disable fullscreen support for certain problematic configurations.
// Support: IE11+ (when embedded).
(function checkFullscreenSupport() {
if (!hasDOM) {
return;
}
if (isIE && window.parent !== window) {
PDFJS.disableFullscreen = true;
}
})();
// Provides document.currentScript support // Provides document.currentScript support
// Support: IE, Chrome<29. // Support: IE, Chrome<29.
(function checkCurrentScript() { (function checkCurrentScript() {

View File

@ -44,6 +44,7 @@ import { PDFThumbnailViewer } from './pdf_thumbnail_viewer';
import { PDFViewer } from './pdf_viewer'; import { PDFViewer } from './pdf_viewer';
import { SecondaryToolbar } from './secondary_toolbar'; import { SecondaryToolbar } from './secondary_toolbar';
import { Toolbar } from './toolbar'; import { Toolbar } from './toolbar';
import { viewerCompatibilityParams } from './viewer_compatibility';
import { ViewHistory } from './view_history'; import { ViewHistory } from './view_history';
const DEFAULT_SCALE_DELTA = 1.1; const DEFAULT_SCALE_DELTA = 1.1;
@ -561,7 +562,7 @@ let PDFViewerApplication = {
support = false; support = false;
} }
} }
if (support && PDFJS.disableFullscreen === true) { if (support && viewerCompatibilityParams['disableFullscreen'] === true) {
support = false; support = false;
} }

View File

@ -65,14 +65,6 @@ let NullL10n = {
}, },
}; };
/**
* Disables fullscreen support, and by extension Presentation Mode,
* in browsers which support the fullscreen API.
* @var {boolean}
*/
PDFJS.disableFullscreen = (PDFJS.disableFullscreen === undefined ?
false : PDFJS.disableFullscreen);
/** /**
* Enables CSS only zooming. * Enables CSS only zooming.
* @var {boolean} * @var {boolean}
@ -110,7 +102,7 @@ if (typeof PDFJSDev === 'undefined' ||
*/ */
PDFJS.locale = PDFJS.locale =
(PDFJS.locale === undefined && typeof navigator !== 'undefined' ? (PDFJS.locale === undefined && typeof navigator !== 'undefined' ?
navigator.language : PDFJS.locale); navigator.language : PDFJS.locale) || 'en-US';
} }
/** /**

View File

@ -0,0 +1,44 @@
/* Copyright 2018 Mozilla Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
let compatibilityParams = Object.create(null);
if (typeof PDFJSDev === 'undefined' || PDFJSDev.test('GENERIC')) {
const userAgent =
(typeof navigator !== 'undefined' && navigator.userAgent) || '';
const isAndroid = /Android/.test(userAgent);
const isIE = /Trident/.test(userAgent);
const isIOS = /\b(iPad|iPhone|iPod)(?=;)/.test(userAgent);
// Disable fullscreen support for certain problematic configurations.
// Support: IE11+ (when embedded).
(function checkFullscreenSupport() {
if (isIE && window.parent !== window) {
compatibilityParams.disableFullscreen = true;
}
})();
// Limit canvas size to 5 mega-pixels on mobile.
// Support: Android, iOS
(function checkCanvasSizeLimitation() {
if (isIOS || isAndroid) {
compatibilityParams.maxCanvasPixels = 5242880;
}
})();
}
const viewerCompatibilityParams = Object.freeze(compatibilityParams);
export {
viewerCompatibilityParams,
};