From dcb174ed5896d85f81422fecf27c00fdaa7f3498 Mon Sep 17 00:00:00 2001 From: Samuel Chantaraud Date: Thu, 27 Feb 2014 13:45:02 -0400 Subject: [PATCH] Made viewer's webViewerLoad callable from outside viewer.js To allow manual triggering when DOMContentLoaded can not be relied upon. --- web/viewer.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/viewer.js b/web/viewer.js index 331fb0b29..00fc759d9 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1592,12 +1592,12 @@ var DocumentOutlineView = function documentOutlineView(outline) { //})(); //#endif -document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) { +function webViewerLoad(evt) { PDFView.initialize(); //#if (GENERIC || B2G) var params = PDFView.parseQueryString(document.location.search.substring(1)); - var file = params.file || DEFAULT_URL; + var file = 'file' in params ? params.file : DEFAULT_URL; //#endif //#if (FIREFOX || MOZCENTRAL) //var file = window.location.href.split('#')[0]; @@ -1813,7 +1813,9 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) { //#endif //#if !B2G && !CHROME - PDFView.open(file, 0); + if (file) { + PDFView.open(file, 0); + } //#endif //#if CHROME @@ -1845,7 +1847,9 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) { // PDFView.open(file, 0); //}); //#endif -}, true); +} + +document.addEventListener('DOMContentLoaded', webViewerLoad, true); function updateViewarea() {