Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ES6-ify the code in web/chromecom.js

Browse Source 
These changes consists mainly of replacing `var` with `let`.
This commit is contained in:
Jonas Jenwald 2017-11-05 13:26:06 +01:00
parent f87c16bcc4
commit 730928a402
1 changed files with 107 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
web/chromecom.js
View File

@ -25,103 +25,104 @@ if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('CHROME')) {
'CHROME build.'); 'CHROME build.');
} }
var ChromeCom = {}; let ChromeCom = {
/** /**
* Creates an event that the extension is listening for and will * Creates an event that the extension is listening for and will
* asynchronously respond by calling the callback. * asynchronously respond by calling the callback.
* *
* @param {String} action The action to trigger. * @param {String} action The action to trigger.
* @param {String} data Optional data to send. * @param {String} data Optional data to send.
* @param {Function} callback Optional response callback that will be called * @param {Function} callback Optional response callback that will be called
* with one data argument. When the request cannot be handled, the callback * with one data argument. When the request cannot be handled, the callback
* is immediately invoked with no arguments. * is immediately invoked with no arguments.
*/ */
ChromeCom.request = function ChromeCom_request(action, data, callback) { request(action, data, callback) {
var message = { let message = {
action, action,
data, data,
}; };
if (!chrome.runtime) { if (!chrome.runtime) {
console.error('chrome.runtime is undefined.'); console.error('chrome.runtime is undefined.');
if (callback) { if (callback) {
callback(); callback();
}
} else if (callback) {
chrome.runtime.sendMessage(message, callback);
} else {
chrome.runtime.sendMessage(message);
}
};
/**
* Resolves a PDF file path and attempts to detects length.
*
* @param {String} file - Absolute URL of PDF file.
* @param {OverlayManager} overlayManager - Manager for the viewer overlays.
* @param {Function} callback - A callback with resolved URL and file length.
*/
ChromeCom.resolvePDFFile = function(file, overlayManager, callback) {
// Expand drive:-URLs to filesystem URLs (Chrome OS)
file = file.replace(/^drive:/i,
'filesystem:' + location.origin + '/external/');
if (/^filesystem:/.test(file) && !PDFJS.disableWorker) {
// The security origin of filesystem:-URLs are not preserved when the
// URL is passed to a Web worker, (http://crbug.com/362061), so we have
// to create an intermediate blob:-URL as a work-around.
var resolveLocalFileSystemURL = window.resolveLocalFileSystemURL ||
window.webkitResolveLocalFileSystemURL;
resolveLocalFileSystemURL(file, function onResolvedFSURL(fileEntry) {
fileEntry.file(function(fileObject) {
var blobUrl = URL.createObjectURL(fileObject);
callback(blobUrl, fileObject.size);
});
}, function onFileSystemError(error) {
// This should not happen. When it happens, just fall back to the
// usual way of getting the File's data (via the Web worker).
console.warn('Cannot resolve file ' + file + ', ' + error.name + ' ' +
error.message);
callback(file);
});
return;
}
if (/^https?:/.test(file)) {
// Assumption: The file being opened is the file that was requested.
// There is no UI to input a different URL, so this assumption will hold
// for now.
setReferer(file, function() {
callback(file);
});
return;
}
if (/^file?:/.test(file)) {
getEmbedderOrigin(function(origin) {
// If the origin cannot be determined, let Chrome decide whether to
// allow embedding files. Otherwise, only allow local files to be
// embedded from local files or Chrome extensions.
// Even without this check, the file load in frames is still blocked,
// but this may change in the future (https://crbug.com/550151).
if (origin && !/^file:|^chrome-extension:/.test(origin)) {
PDFViewerApplication.error('Blocked ' + origin + ' from loading ' +
file + '. Refused to load a local file in a non-local page ' +
'for security reasons.');
return;
} }
isAllowedFileSchemeAccess(function(isAllowedAccess) { } else if (callback) {
if (isAllowedAccess) { chrome.runtime.sendMessage(message, callback);
callback(file); } else {
} else { chrome.runtime.sendMessage(message);
requestAccessToLocalFile(file, overlayManager); }
} },
/**
* Resolves a PDF file path and attempts to detects length.
*
* @param {String} file - Absolute URL of PDF file.
* @param {OverlayManager} overlayManager - Manager for the viewer overlays.
* @param {Function} callback - A callback with resolved URL and file length.
*/
resolvePDFFile(file, overlayManager, callback) {
// Expand drive:-URLs to filesystem URLs (Chrome OS)
file = file.replace(/^drive:/i,
'filesystem:' + location.origin + '/external/');
if (/^filesystem:/.test(file) && !PDFJS.disableWorker) {
// The security origin of filesystem:-URLs are not preserved when the
// URL is passed to a Web worker, (http://crbug.com/362061), so we have
// to create an intermediate blob:-URL as a work-around.
let resolveLocalFileSystemURL = window.resolveLocalFileSystemURL ||
window.webkitResolveLocalFileSystemURL;
resolveLocalFileSystemURL(file, function onResolvedFSURL(fileEntry) {
fileEntry.file(function(fileObject) {
let blobUrl = URL.createObjectURL(fileObject);
callback(blobUrl, fileObject.size);
});
}, function onFileSystemError(error) {
// This should not happen. When it happens, just fall back to the
// usual way of getting the File's data (via the Web worker).
console.warn('Cannot resolve file ' + file + ', ' + error.name + ' ' +
error.message);
callback(file);
}); });
}); return;
return; }
} if (/^https?:/.test(file)) {
callback(file); // Assumption: The file being opened is the file that was requested.
// There is no UI to input a different URL, so this assumption will hold
// for now.
setReferer(file, function() {
callback(file);
});
return;
}
if (/^file?:/.test(file)) {
getEmbedderOrigin(function(origin) {
// If the origin cannot be determined, let Chrome decide whether to
// allow embedding files. Otherwise, only allow local files to be
// embedded from local files or Chrome extensions.
// Even without this check, the file load in frames is still blocked,
// but this may change in the future (https://crbug.com/550151).
if (origin && !/^file:|^chrome-extension:/.test(origin)) {
PDFViewerApplication.error('Blocked ' + origin + ' from loading ' +
file + '. Refused to load a local file in a non-local page ' +
'for security reasons.');
return;
}
isAllowedFileSchemeAccess(function(isAllowedAccess) {
if (isAllowedAccess) {
callback(file);
} else {
requestAccessToLocalFile(file, overlayManager);
}
});
});
return;
}
callback(file);
},
}; };
function getEmbedderOrigin(callback) { function getEmbedderOrigin(callback) {
var origin = window === top ? location.origin : location.ancestorOrigins[0]; let origin = window === top ? location.origin : location.ancestorOrigins[0];
if (origin === 'null') { if (origin === 'null') {
// file:-URLs, data-URLs, sandboxed frames, etc. // file:-URLs, data-URLs, sandboxed frames, etc.
getParentOrigin(callback); getParentOrigin(callback);
@ -155,9 +156,9 @@ function reloadIfRuntimeIsUnavailable() {
} }
} }
var chromeFileAccessOverlayPromise; let chromeFileAccessOverlayPromise;
function requestAccessToLocalFile(fileUrl, overlayManager) { function requestAccessToLocalFile(fileUrl, overlayManager) {
var onCloseOverlay = null; let onCloseOverlay = null;
if (top !== window) { if (top !== window) {
// When the extension reloads after receiving new permissions, the pages // When the extension reloads after receiving new permissions, the pages
// have to be reloaded to restore the extension runtime. Auto-reload // have to be reloaded to restore the extension runtime. Auto-reload
@ -180,7 +181,7 @@ function requestAccessToLocalFile(fileUrl, overlayManager) {
onCloseOverlay, true); onCloseOverlay, true);
} }
chromeFileAccessOverlayPromise.then(function() { chromeFileAccessOverlayPromise.then(function() {
var iconPath = chrome.runtime.getManifest().icons[48]; let iconPath = chrome.runtime.getManifest().icons[48];
document.getElementById('chrome-pdfjs-logo-bg').style.backgroundImage = document.getElementById('chrome-pdfjs-logo-bg').style.backgroundImage =
'url(' + chrome.runtime.getURL(iconPath) + ')'; 'url(' + chrome.runtime.getURL(iconPath) + ')';
@ -188,7 +189,7 @@ function requestAccessToLocalFile(fileUrl, overlayManager) {
// because the shown string should match the UI at chrome://extensions. // because the shown string should match the UI at chrome://extensions.
// These strings are from chrome/app/resources/generated_resources_*.xtb. // These strings are from chrome/app/resources/generated_resources_*.xtb.
/* eslint-disable no-unexpected-multiline */ /* eslint-disable no-unexpected-multiline */
var i18nFileAccessLabel = let i18nFileAccessLabel =
PDFJSDev.json('$ROOT/web/chrome-i18n-allow-access-to-file-urls.json') PDFJSDev.json('$ROOT/web/chrome-i18n-allow-access-to-file-urls.json')
[chrome.i18n.getUILanguage && chrome.i18n.getUILanguage()]; [chrome.i18n.getUILanguage && chrome.i18n.getUILanguage()];
/* eslint-enable no-unexpected-multiline */ /* eslint-enable no-unexpected-multiline */
@ -198,7 +199,7 @@ function requestAccessToLocalFile(fileUrl, overlayManager) {
i18nFileAccessLabel; i18nFileAccessLabel;
} }
var link = document.getElementById('chrome-link-to-extensions-page'); let link = document.getElementById('chrome-link-to-extensions-page');
link.href = 'chrome://extensions/?id=' + chrome.runtime.id; link.href = 'chrome://extensions/?id=' + chrome.runtime.id;
link.onclick = function(e) { link.onclick = function(e) {
// Direct navigation to chrome:// URLs is blocked by Chrome, so we // Direct navigation to chrome:// URLs is blocked by Chrome, so we
@ -243,7 +244,7 @@ if (window === top) {
// to the background page. // to the background page.
// 3. When the background page knows the referrer of the page, the referrer is // 3. When the background page knows the referrer of the page, the referrer is
// saved in history.state.chromecomState. // saved in history.state.chromecomState.
var port; let port;
// Set the referer for the given URL. // Set the referer for the given URL.
// 0. Background: If loaded via a http(s) URL: Save referer. // 0. Background: If loaded via a http(s) URL: Save referer.
// 1. Page -> background: send URL and referer from history.state // 1. Page -> background: send URL and referer from history.state
@ -271,7 +272,7 @@ function setReferer(url, callback) {
// back and forward, the background page will not observe a HTTP request // back and forward, the background page will not observe a HTTP request
// with Referer. To make sure that the Referer is preserved, store it in // with Referer. To make sure that the Referer is preserved, store it in
// history.state, which is preserved across reloads/navigations. // history.state, which is preserved across reloads/navigations.
var state = window.history.state || {}; let state = window.history.state || {};
state.chromecomState = referer; state.chromecomState = referer;
window.history.replaceState(state, ''); window.history.replaceState(state, '');
} }
@ -292,13 +293,13 @@ function setReferer(url, callback) {
// chrome.storage.sync is not supported in every Chromium-derivate. // chrome.storage.sync is not supported in every Chromium-derivate.
// Note: The background page takes care of migrating values from // Note: The background page takes care of migrating values from
// chrome.storage.local to chrome.storage.sync when needed. // chrome.storage.local to chrome.storage.sync when needed.
var storageArea = chrome.storage.sync || chrome.storage.local; let storageArea = chrome.storage.sync || chrome.storage.local;
class ChromePreferences extends BasePreferences { class ChromePreferences extends BasePreferences {
_writeToStorage(prefObj) { _writeToStorage(prefObj) {
return new Promise((resolve) => { return new Promise((resolve) => {
if (prefObj === this.defaults) { if (prefObj === this.defaults) {
var keysToRemove = Object.keys(this.defaults); let keysToRemove = Object.keys(this.defaults);
// If the storage is reset, remove the keys so that the values from // If the storage is reset, remove the keys so that the values from
// managed storage are applied again. // managed storage are applied again.
storageArea.remove(keysToRemove, function() { storageArea.remove(keysToRemove, function() {
@ -314,7 +315,7 @@ class ChromePreferences extends BasePreferences {
_readFromStorage(prefObj) { _readFromStorage(prefObj) {
return new Promise((resolve) => { return new Promise((resolve) => {
var getPreferences = (defaultPrefs) => { let getPreferences = (defaultPrefs) => {
if (chrome.runtime.lastError) { if (chrome.runtime.lastError) {
// Managed storage not supported, e.g. in Opera. // Managed storage not supported, e.g. in Opera.
defaultPrefs = this.defaults; defaultPrefs = this.defaults;
@ -348,11 +349,11 @@ class ChromePreferences extends BasePreferences {
} }
} }
var ChromeExternalServices = Object.create(DefaultExternalServices); let ChromeExternalServices = Object.create(DefaultExternalServices);
ChromeExternalServices.initPassiveLoading = function (callbacks) { ChromeExternalServices.initPassiveLoading = function(callbacks) {
let { appConfig, overlayManager, } = PDFViewerApplication; let { appConfig, overlayManager, } = PDFViewerApplication;
ChromeCom.resolvePDFFile(appConfig.defaultUrl, overlayManager, ChromeCom.resolvePDFFile(appConfig.defaultUrl, overlayManager,
function (url, length, originalURL) { function(url, length, originalURL) {
callbacks.onOpenWithURL(url, length, originalURL); callbacks.onOpenWithURL(url, length, originalURL);
}); });
}; };
@ -362,7 +363,7 @@ ChromeExternalServices.createDownloadManager = function() {
ChromeExternalServices.createPreferences = function() { ChromeExternalServices.createPreferences = function() {
return new ChromePreferences(); return new ChromePreferences();
}; };
ChromeExternalServices.createL10n = function () { ChromeExternalServices.createL10n = function() {
return new GenericL10n(navigator.language); return new GenericL10n(navigator.language);
}; };
PDFViewerApplication.externalServices = ChromeExternalServices; PDFViewerApplication.externalServices = ChromeExternalServices;