diff --git a/README.md b/README.md
index 3b8d86bb1..34b1a3f5e 100644
--- a/README.md
+++ b/README.md
@@ -61,13 +61,13 @@ You can also view all the test pdf files on the right side serving
+ http://localhost:8888/test/pdfs/?frame
-### Building pdf.js
+### Building pdf.js.
-In order to bundle all `src/` files into a final `pdf.js`, issue:
+In order to bundle all `src/` files into a final `pdf.js` and build the generic viewer, issue:
- $ node make bundle
+ $ node make generic
-This will generate the file `build/pdf.js` that can be included in your final project. (WARNING: That's a large file! Consider minifying it).
+This will generate the file `build/generic/build/pdf.js` that can be included in your final project. The pdf.js file is large and should be minified for production. Also, if you would like to support more browsers than firefox you'll also need to include `compatibility.js` from `build/generic/web/`.
# Learning
diff --git a/external/builder/builder.js b/external/builder/builder.js
new file mode 100644
index 000000000..6eb0cd6ae
--- /dev/null
+++ b/external/builder/builder.js
@@ -0,0 +1,142 @@
+require('../shelljs/make');
+var fs = require('fs'),
+ path = require('path'),
+ vm = require('vm');
+
+/**
+ * A simple preprocessor that is based on the firefox preprocessor
+ * see (https://developer.mozilla.org/en/Build/Text_Preprocessor). The main
+ * difference is that this supports a subset of the commands and it supports
+ * preproccesor commands in html style comments.
+ * Currently Supported commands:
+ * - if
+ * - else
+ * - endif
+ * - include
+ * - expand
+ */
+function preprocess(inFilename, outFilename, defines) {
+ // TODO make this really read line by line.
+ var lines = fs.readFileSync(inFilename).toString().split('\n');
+ var totalLines = lines.length;
+ var out = '';
+ var i = 0;
+ function readLine() {
+ if (i < totalLines) {
+ return lines[i++];
+ }
+ return null;
+ }
+ var writeLine = typeof outFilename === 'function' ? outFilename : function(line) {
+ out += line + '\n';
+ }
+ function include(file) {
+ var realPath = fs.realpathSync(inFilename);
+ var dir = path.dirname(realPath);
+ preprocess(path.join(dir, file), writeLine, defines);
+ }
+ function expand(line) {
+ line = line.replace(/__[\w]+__/g, function(variable) {
+ variable = variable.substring(2, variable.length - 2);
+ if (variable in defines) {
+ return defines[variable];
+ }
+ return '';
+ });
+ writeLine(line);
+ }
+
+ var s, state = 0, stack = [];
+ var control = /^(?:\/\/|)?$)?/;
+ var lineNumber = 0;
+ while ((s = readLine()) !== null) {
+ ++lineNumber;
+ var m = control.exec(s);
+ if (m) {
+ switch (m[1]) {
+ case 'if':
+ stack.push(state);
+ try {
+ state = vm.runInNewContext(m[2], defines) ? 3 : 1;
+ } catch (e) {
+ console.error('Could not evalute line \'' + m[2] + '\' at ' +
+ fs.realpathSync(inFilename) + ':' + lineNumber);
+ throw e;
+ }
+ break;
+ case 'else':
+ state = state === 1 ? 3 : 2;
+ break;
+ case 'endif':
+ state = stack.pop();
+ break;
+ case 'expand':
+ if (state === 0 || state === 3)
+ expand(m[2]);
+ break;
+ case 'include':
+ if (state === 0 || state === 3)
+ include(m[2]);
+ break;
+ }
+ } else {
+ if (state === 0) {
+ writeLine(s);
+ } else if(state === 3) {
+ writeLine(s.replace(/^\/\/|^/g, " "));
+ }
+ }
+ }
+ if (state !== 0 || stack.length !== 0)
+ throw new Error('Missing endif in preprocessor.');
+ if (typeof outFilename !== 'function')
+ fs.writeFileSync(outFilename, out);
+}
+exports.preprocess = preprocess;
+
+/**
+ * Simplifies common build steps.
+ * @param setup
+ * .defines defines for preprocessors
+ * .copy array of arrays of source and destination pairs of files to copy
+ * .preprocess array of arrays of source and destination pairs of files
+ * run through preprocessor
+ */
+function build(setup) {
+ var defines = setup.defines;
+
+ setup.copy.forEach(function(option) {
+ var source = option[0];
+ var destination = option[1];
+ cp('-R', source, destination);
+ });
+
+ setup.preprocess.forEach(function(option) {
+ var sources = option[0];
+ var destination = option[1];
+
+ sources = ls('-R', sources);
+ sources.forEach(function(source) {
+ // ??? Warn if the source is wildcard and dest is file?
+ var destWithFolder = destination;
+ if (test('-d', destination))
+ destWithFolder += '/' + path.basename(source);
+ preprocess(source, destWithFolder, defines);
+ });
+ });
+}
+exports.build = build;
+
+/**
+ * Merge two defines arrays. Values in the second param will override values in
+ * the first.
+ */
+function merge(defaults, defines) {
+ var ret = {};
+ for (var key in defaults)
+ ret[key] = defaults[key];
+ for (key in defines)
+ ret[key] = defines[key];
+ return ret;
+}
+exports.merge = merge;
diff --git a/make.js b/make.js
index 727e740ca..1d2e5cfcf 100755
--- a/make.js
+++ b/make.js
@@ -1,5 +1,6 @@
#!/usr/bin/env node
require('./external/shelljs/make');
+var builder = require('./external/builder/builder.js');
var ROOT_DIR = __dirname + '/', // absolute path to project's root
BUILD_DIR = 'build/',
@@ -8,6 +9,7 @@ var ROOT_DIR = __dirname + '/', // absolute path to project's root
EXTENSION_SRC_DIR = 'extensions/',
LOCALE_SRC_DIR = 'l10n/',
GH_PAGES_DIR = BUILD_DIR + 'gh-pages/',
+ GENERIC_DIR = BUILD_DIR + 'generic/',
REPO = 'git@github.com:mozilla/pdf.js.git',
PYTHON_BIN = 'python2.7',
MOZCENTRAL_PREF_PREFIX = 'pdfjs',
@@ -15,6 +17,16 @@ var ROOT_DIR = __dirname + '/', // absolute path to project's root
MOZCENTRAL_STREAM_CONVERTER_ID = 'd0c5195d-e798-49d4-b1d3-9324328b2291',
FIREFOX_STREAM_CONVERTER_ID = '6457a96b-2d68-439a-bcfa-44465fbcdbb1';
+var DEFINES = {
+ PRODUCTION: true,
+ // The main build targets:
+ GENERIC: false,
+ FIREFOX: false,
+ MOZCENTRAL: false,
+ B2G: false,
+ CHROME: false
+};
+
//
// make all
//
@@ -31,14 +43,59 @@ target.all = function() {
// Production stuff
//
+// Files that need to be included in every build.
+var COMMON_WEB_FILES =
+ ['web/viewer.css',
+ 'web/images',
+ 'web/debugger.js'],
+ COMMON_WEB_FILES_PREPROCESS =
+ ['web/viewer.js',
+ 'web/viewer.html'];
+
+//
+// make generic
+// Builds the generic production viewer that should be compatible with most
+// modern HTML5 browsers.
+//
+target.generic = function() {
+ target.bundle();
+ target.locale();
+
+ cd(ROOT_DIR);
+ echo();
+ echo('### Creating generic viewer');
+
+ rm('-rf', GENERIC_DIR);
+ mkdir('-p', GENERIC_DIR);
+ mkdir('-p', GENERIC_DIR + BUILD_DIR);
+ mkdir('-p', GENERIC_DIR + '/web');
+
+ var defines = builder.merge(DEFINES, {GENERIC: true});
+
+ var setup = {
+ defines: defines,
+ copy: [
+ [COMMON_WEB_FILES, GENERIC_DIR + '/web'],
+ ['external/webL10n/l10n.js', GENERIC_DIR + '/web'],
+ ['web/compatibility.js', GENERIC_DIR + '/web'],
+ ['web/compressed.tracemonkey-pldi-09.pdf', GENERIC_DIR + '/web'],
+ ['web/locale.properties', GENERIC_DIR + '/web']
+ ],
+ preprocess: [
+ [BUILD_TARGET, GENERIC_DIR + BUILD_TARGET],
+ [COMMON_WEB_FILES_PREPROCESS, GENERIC_DIR + '/web']
+ ]
+ };
+ builder.build(setup);
+};
+
//
// make web
// Generates the website for the project, by checking out the gh-pages branch underneath
// the build directory, and then moving the various viewer files into place.
//
target.web = function() {
- target.production();
- target.locale();
+ target.generic();
target.extension();
target.pagesrepo();
@@ -46,25 +103,18 @@ target.web = function() {
echo();
echo('### Creating web site');
- var GH_PAGES_SRC_FILES = [
- 'web/*',
- 'external/webL10n/l10n.js'
- ];
-
- cp(BUILD_TARGET, GH_PAGES_DIR + BUILD_TARGET);
- cp('-R', GH_PAGES_SRC_FILES, GH_PAGES_DIR + '/web');
+ cp('-R', GENERIC_DIR + '/*', GH_PAGES_DIR);
cp(FIREFOX_BUILD_DIR + '/*.xpi', FIREFOX_BUILD_DIR + '/*.rdf',
- GH_PAGES_DIR + EXTENSION_SRC_DIR + 'firefox/');
- cp(GH_PAGES_DIR + '/web/index.html.template', GH_PAGES_DIR + '/index.html');
- mv('-f', GH_PAGES_DIR + '/web/viewer-production.html',
- GH_PAGES_DIR + '/web/viewer.html');
+ GH_PAGES_DIR + EXTENSION_SRC_DIR + 'firefox/');
+ cp('web/index.html.template', GH_PAGES_DIR + '/index.html');
+
cd(GH_PAGES_DIR);
exec('git add -A');
echo();
echo("Website built in " + GH_PAGES_DIR);
echo("Don't forget to cd into " + GH_PAGES_DIR +
- " and issue 'git commit' to push changes.");
+ " and issue 'git commit' to push changes.");
};
//
@@ -124,20 +174,10 @@ target.locale = function() {
chromeManifestContent.to(CHROME_MANIFEST_OUTPUT);
};
-//
-// make production
-// Creates production output (pdf.js, and corresponding changes to web/ files)
-//
-target.production = function() {
- target.bundle();
- target.viewer();
-};
-
//
// make bundle
// Bundles all source files into one wrapper 'pdf.js' file, in the given order.
//
-
target.bundle = function() {
cd(ROOT_DIR);
echo();
@@ -178,29 +218,12 @@ target.bundle = function() {
bundleVersion = exec('git log --format="%h" -n 1',
{silent: true}).output.replace('\n', '');
- sed(/.*PDFJSSCRIPT_INCLUDE_ALL.*\n/, bundle, 'pdf.js')
- .to(ROOT_DIR + BUILD_TARGET);
- sed('-i', 'PDFJSSCRIPT_BUNDLE_VER', bundleVersion, ROOT_DIR + BUILD_TARGET);
+ // This just preprocesses the empty pdf.js file, we don't actually want to
+ // preprocess everything yet since other build targets use this file.
+ builder.preprocess('pdf.js', ROOT_DIR + BUILD_TARGET,
+ {BUNDLE: bundle, BUNDLE_VERSION: bundleVersion});
};
-//
-// make viewer
-// Changes development
+
+
diff --git a/web/viewer-snippet-firefox-extension.html b/web/viewer-snippet-firefox-extension.html
index 57d7875eb..5b8cc9eaf 100644
--- a/web/viewer-snippet-firefox-extension.html
+++ b/web/viewer-snippet-firefox-extension.html
@@ -1,14 +1,11 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/web/viewer.js b/web/viewer.js
index e3cce776c..03766ab19 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -90,66 +90,9 @@ var ProgressBar = (function ProgressBarClosure() {
return ProgressBar;
})();
-var FirefoxCom = (function FirefoxComClosure() {
- return {
- /**
- * Creates an event that the extension is listening for and will
- * synchronously respond to.
- * NOTE: It is reccomended to use request() instead since one day we may not
- * be able to synchronously reply.
- * @param {String} action The action to trigger.
- * @param {String} data Optional data to send.
- * @return {*} The response.
- */
- requestSync: function(action, data) {
- var request = document.createTextNode('');
- request.setUserData('action', action, null);
- request.setUserData('data', data, null);
- request.setUserData('sync', true, null);
- document.documentElement.appendChild(request);
-
- var sender = document.createEvent('Events');
- sender.initEvent('pdf.js.message', true, false);
- request.dispatchEvent(sender);
- var response = request.getUserData('response');
- document.documentElement.removeChild(request);
- return response;
- },
- /**
- * Creates an event that the extension is listening for and will
- * asynchronously respond by calling the callback.
- * @param {String} action The action to trigger.
- * @param {String} data Optional data to send.
- * @param {Function} callback Optional response callback that will be called
- * with one data argument.
- */
- request: function(action, data, callback) {
- var request = document.createTextNode('');
- request.setUserData('action', action, null);
- request.setUserData('data', data, null);
- request.setUserData('sync', false, null);
- if (callback) {
- request.setUserData('callback', callback, null);
-
- document.addEventListener('pdf.js.response', function listener(event) {
- var node = event.target,
- callback = node.getUserData('callback'),
- response = node.getUserData('response');
-
- document.documentElement.removeChild(node);
-
- document.removeEventListener('pdf.js.response', listener, false);
- return callback(response);
- }, false);
- }
- document.documentElement.appendChild(request);
-
- var sender = document.createEvent('HTMLEvents');
- sender.initEvent('pdf.js.message', true, false);
- return request.dispatchEvent(sender);
- }
- };
-})();
+//#if FIREFOX || MOZCENTRAL
+//#include firefoxcom.js
+//#endif
// Settings Manager - This is a utility for saving settings
// First we see if localStorage is available
@@ -167,17 +110,17 @@ var Settings = (function SettingsClosure() {
}
})();
- var isFirefoxExtension = PDFJS.isFirefoxExtension;
-
function Settings(fingerprint) {
var database = null;
var index;
- if (isFirefoxExtension)
- database = FirefoxCom.requestSync('getDatabase', null) || '{}';
- else if (isLocalStorageEnabled)
+//#if !(FIREFOX || MOZCENTRAL)
+ if (isLocalStorageEnabled)
database = localStorage.getItem('database') || '{}';
else
- return false;
+ return;
+//#else
+// database = FirefoxCom.requestSync('getDatabase', null) || '{}';
+//#endif
database = JSON.parse(database);
if (!('files' in database))
@@ -205,10 +148,12 @@ var Settings = (function SettingsClosure() {
var file = this.file;
file[name] = val;
var database = JSON.stringify(this.database);
- if (isFirefoxExtension)
- FirefoxCom.requestSync('setDatabase', database);
- else if (isLocalStorageEnabled)
+//#if !(FIREFOX || MOZCENTRAL)
+ if (isLocalStorageEnabled)
localStorage.setItem('database', database);
+//#else
+// FirefoxCom.requestSync('setDatabase', database);
+//#endif
},
get: function settingsGet(name, defaultValue) {
@@ -351,9 +296,10 @@ var PDFView = {
set page(val) {
var pages = this.pages;
var input = document.getElementById('pageNumber');
+ var event = document.createEvent('UIEvents');
+ event.initUIEvent('pagechange', false, false, window, 0);
+
if (!(0 < val && val <= pages.length)) {
- var event = document.createEvent('UIEvents');
- event.initUIEvent('pagechange', false, false, window, 0);
event.pageNumber = this.page;
window.dispatchEvent(event);
return;
@@ -361,8 +307,6 @@ var PDFView = {
pages[val - 1].updateStats();
currentPageNumber = val;
- var event = document.createEvent('UIEvents');
- event.initUIEvent('pagechange', false, false, window, 0);
event.pageNumber = val;
window.dispatchEvent(event);
@@ -460,52 +404,54 @@ var PDFView = {
}
var url = this.url.split('#')[0];
- if (PDFJS.isFirefoxExtension) {
- // Document isn't ready just try to download with the url.
- if (!this.pdfDocument) {
- noData();
- return;
- }
- this.pdfDocument.getData().then(
- function getDataSuccess(data) {
- var bb = new MozBlobBuilder();
- bb.append(data.buffer);
- var blobUrl = window.URL.createObjectURL(
- bb.getBlob('application/pdf'));
-
- FirefoxCom.request('download', { blobUrl: blobUrl, originalUrl: url },
- function response(err) {
- if (err) {
- // This error won't really be helpful because it's likely the
- // fallback won't work either (or is already open).
- PDFView.error('PDF failed to download.');
- }
- window.URL.revokeObjectURL(blobUrl);
- }
- );
- },
- noData // Error ocurred try downloading with just the url.
- );
- } else {
- url += '#pdfjs.action=download', '_parent';
- window.open(url, '_parent');
- }
+//#if !(FIREFOX || MOZCENTRAL)
+ url += '#pdfjs.action=download';
+ window.open(url, '_parent');
+//#else
+// // Document isn't ready just try to download with the url.
+// if (!this.pdfDocument) {
+// noData();
+// return;
+// }
+// this.pdfDocument.getData().then(
+// function getDataSuccess(data) {
+// var bb = new MozBlobBuilder();
+// bb.append(data.buffer);
+// var blobUrl = window.URL.createObjectURL(
+// bb.getBlob('application/pdf'));
+//
+// FirefoxCom.request('download', { blobUrl: blobUrl, originalUrl: url },
+// function response(err) {
+// if (err) {
+// // This error won't really be helpful because it's likely the
+// // fallback won't work either (or is already open).
+// PDFView.error('PDF failed to download.');
+// }
+// window.URL.revokeObjectURL(blobUrl);
+// }
+// );
+// },
+// noData // Error occurred try downloading with just the url.
+// );
+//#endif
},
fallback: function pdfViewFallback() {
- if (!PDFJS.isFirefoxExtension)
- return;
- // Only trigger the fallback once so we don't spam the user with messages
- // for one PDF.
- if (this.fellback)
- return;
- this.fellback = true;
- var url = this.url.split('#')[0];
- FirefoxCom.request('fallback', url, function response(download) {
- if (!download)
- return;
- PDFView.download();
- });
+//#if !(FIREFOX || MOZCENTRAL)
+// return;
+//#else
+// // Only trigger the fallback once so we don't spam the user with messages
+// // for one PDF.
+// if (this.fellback)
+// return;
+// this.fellback = true;
+// var url = this.url.split('#')[0];
+// FirefoxCom.request('fallback', url, function response(download) {
+// if (!download)
+// return;
+// PDFView.download();
+// });
+//#endif
},
navigateTo: function pdfViewNavigateTo(dest) {
@@ -557,9 +503,11 @@ var PDFView = {
* @param {String} anchor The anchor hash include the #.
*/
getAnchorUrl: function getAnchorUrl(anchor) {
- if (PDFJS.isFirefoxExtension)
- return this.url.split('#')[0] + anchor;
+//#if !(FIREFOX || MOZCENTRAL)
return anchor;
+//#else
+// return this.url.split('#')[0] + anchor;
+//#endif
},
/**
@@ -593,11 +541,7 @@ var PDFView = {
}
}
}
- if (PDFJS.isFirefoxExtension) {
- console.error(message + '\n' + moreInfoText);
- this.fallback();
- return;
- }
+//#if !(FIREFOX || MOZCENTRAL)
var errorWrapper = document.getElementById('errorWrapper');
errorWrapper.removeAttribute('hidden');
@@ -627,6 +571,10 @@ var PDFView = {
errorMoreInfo.value = moreInfoText;
errorMoreInfo.rows = moreInfoText.split('\n').length - 1;
+//#else
+// console.error(message + '\n' + moreInfoText);
+// this.fallback();
+//#endif
},
progress: function pdfViewProgress(level) {
@@ -797,7 +745,6 @@ var PDFView = {
var numVisible = visibleViews.length;
if (numVisible === 0) {
- info('No visible views.');
return false;
}
for (var i = 0; i < numVisible; ++i) {
@@ -851,14 +798,14 @@ var PDFView = {
search: function pdfViewStartSearch() {
// Limit this function to run every ms.
var SEARCH_TIMEOUT = 250;
- var lastSeach = this.lastSearch;
+ var lastSearch = this.lastSearch;
var now = Date.now();
- if (lastSeach && (now - lastSeach) < SEARCH_TIMEOUT) {
+ if (lastSearch && (now - lastSearch) < SEARCH_TIMEOUT) {
if (!this.searchTimer) {
this.searchTimer = setTimeout(function resumeSearch() {
PDFView.search();
},
- SEARCH_TIMEOUT - (now - lastSeach)
+ SEARCH_TIMEOUT - (now - lastSearch)
);
}
return;
@@ -945,7 +892,6 @@ var PDFView = {
} else {
this.page = pageNumber; // simple page
}
- return;
}
} else if (/^\d+$/.test(hash)) // page number
this.page = hash;
@@ -1016,7 +962,7 @@ var PDFView = {
extractPageText(pageIndex + 1);
}
);
- };
+ }
extractPageText(0);
},
@@ -1722,13 +1668,13 @@ var CustomStyle = (function CustomStyleClosure() {
//if all fails then set to undefined
return (_cache[propName] = 'undefined');
- }
+ };
CustomStyle.setProp = function set(propName, element, str) {
var prop = this.getProp(propName);
if (prop != 'undefined')
element.style[prop] = str;
- }
+ };
return CustomStyle;
})();
@@ -1758,6 +1704,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
if (textDivs.length === 0) {
clearInterval(renderTimer);
renderingDone = true;
+ self.textLayerDiv = textLayerDiv = canvas = ctx = null;
return;
}
var textDiv = textDivs.shift();
@@ -1797,7 +1744,7 @@ var TextLayerBuilder = function textLayerBuilder(textLayerDiv) {
// Resume rendering
renderTimer = setInterval(renderTextLayer, renderInterval);
}, resumeInterval);
- }; // textLayerOnScroll
+ } // textLayerOnScroll
window.addEventListener('scroll', textLayerOnScroll, false);
}; // endLayout
@@ -1825,15 +1772,21 @@ window.addEventListener('load', function webViewerLoad(evt) {
PDFView.initialize();
var params = PDFView.parseQueryString(document.location.search.substring(1));
- var file = PDFJS.isFirefoxExtension ?
- window.location.toString() : params.file || kDefaultURL;
+//#if !(FIREFOX || MOZCENTRAL)
+ var file = params.file || kDefaultURL;
+//#else
+//var file = window.location.toString()
+//#endif
- if (PDFJS.isFirefoxExtension || !window.File || !window.FileReader ||
- !window.FileList || !window.Blob) {
+//#if !(FIREFOX || MOZCENTRAL)
+ if (!window.File || !window.FileReader || !window.FileList || !window.Blob) {
document.getElementById('openFile').setAttribute('hidden', 'true');
} else {
document.getElementById('fileInput').value = null;
}
+//#else
+//document.getElementById('openFile').setAttribute('hidden', 'true');
+//#endif
// Special debugging flags in the hash section of the URL.
var hash = document.location.hash.substring(1);
@@ -1842,18 +1795,21 @@ window.addEventListener('load', function webViewerLoad(evt) {
if ('disableWorker' in hashParams)
PDFJS.disableWorker = (hashParams['disableWorker'] === 'true');
- if (!PDFJS.isFirefoxExtension) {
- var locale = navigator.language;
- if ('locale' in hashParams)
- locale = hashParams['locale'];
- mozL10n.language.code = locale;
- }
+//#if !(FIREFOX || MOZCENTRAL)
+ var locale = navigator.language;
+ if ('locale' in hashParams)
+ locale = hashParams['locale'];
+ mozL10n.language.code = locale;
+//#endif
if ('disableTextLayer' in hashParams)
PDFJS.disableTextLayer = (hashParams['disableTextLayer'] === 'true');
- if ('pdfBug' in hashParams &&
- (!PDFJS.isFirefoxExtension || FirefoxCom.requestSync('pdfBugEnabled'))) {
+//#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(',');
@@ -1861,10 +1817,12 @@ window.addEventListener('load', function webViewerLoad(evt) {
PDFBug.init();
}
- if (!PDFJS.isFirefoxExtension ||
- (PDFJS.isFirefoxExtension && FirefoxCom.requestSync('searchEnabled'))) {
- document.querySelector('#viewSearch').classList.remove('hidden');
- }
+//#if !(FIREFOX || MOZCENTRAL)
+//#else
+//if (FirefoxCom.requestSync('searchEnabled')) {
+// document.querySelector('#viewSearch').classList.remove('hidden');
+//}
+//#endif
if (!PDFView.supportsPrinting) {
document.getElementById('print').classList.add('hidden');
@@ -1901,8 +1859,9 @@ window.addEventListener('load', function webViewerLoad(evt) {
PDFView.sidebarOpen = outerContainer.classList.contains('sidebarOpen');
PDFView.renderHighestPriority();
});
-
+//#if !B2G
PDFView.open(file, 0);
+//#endif
}, true);
function updateViewarea() {
@@ -1984,20 +1943,13 @@ window.addEventListener('change', function webViewerChange(evt) {
// Read the local file into a Uint8Array.
var fileReader = new FileReader();
fileReader.onload = function webViewerChangeFileReaderOnload(evt) {
- var data = evt.target.result;
- var buffer = new ArrayBuffer(data.length);
+ var buffer = evt.target.result;
var uint8Array = new Uint8Array(buffer);
-
- for (var i = 0; i < data.length; i++)
- uint8Array[i] = data.charCodeAt(i);
-
PDFView.open(uint8Array, 0);
};
- // Read as a binary string since "readAsArrayBuffer" is not yet
- // implemented in Firefox.
var file = files[0];
- fileReader.readAsBinaryString(file);
+ fileReader.readAsArrayBuffer(file);
document.title = file.name;
// URL does not reflect proper document location - hiding some icons.
@@ -2180,3 +2132,21 @@ window.addEventListener('afterprint', function afterPrint(evt) {
window.addEventListener('mozfullscreenchange', fullscreenChange, false);
window.addEventListener('webkitfullscreenchange', fullscreenChange, false);
})();
+
+//#if B2G
+//window.navigator.mozSetMessageHandler('activity', function(activity) {
+// var url = activity.source.data.url;
+// // Temporarily get the data here since the cross domain xhr is broken in
+// // the worker currently, see bug 761227.
+// var params = {
+// url: url,
+// error: function(e) {
+// PDFView.error(mozL10n.get('loading_error', null,
+// 'An error occurred while loading the PDF.'), e);
+// }
+// };
+// PDFJS.getPdf(params, function successCallback(data) {
+// PDFView.open(data, 0);
+// });
+//});
+//#endif