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

Fix loadingBar hiding when disableAutoFetch is enabled (issue 3590)

Browse Source
This commit is contained in:
Jonas Jenwald 2014-08-17 01:06:03 +02:00
parent cfeb4c1019
commit ecbb39f983
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/ui_utils.js
View File

@ -275,6 +275,7 @@ var ProgressBar = (function ProgressBarClosure() {
} }
function ProgressBar(id, opts) { function ProgressBar(id, opts) {
this.visible = true;
// Fetch the sub-elements for later. // Fetch the sub-elements for later.
this.div = document.querySelector(id + ' .progress'); this.div = document.querySelector(id + ' .progress');
@ -328,8 +329,21 @@ var ProgressBar = (function ProgressBarClosure() {
}, },
hide: function ProgressBar_hide() { hide: function ProgressBar_hide() {
if (!this.visible) {
return;
}
this.visible = false;
this.bar.classList.add('hidden'); this.bar.classList.add('hidden');
document.body.classList.remove('loadingInProgress'); document.body.classList.remove('loadingInProgress');
},
show: function ProgressBar_show() {
if (this.visible) {
return;
}
this.visible = true;
document.body.classList.add('loadingInProgress');
this.bar.classList.remove('hidden');
} }
}; };

19
web/viewer.js
View File

@ -35,6 +35,7 @@ var VIEW_HISTORY_MEMORY = 20;
var SCALE_SELECT_CONTAINER_PADDING = 8; var SCALE_SELECT_CONTAINER_PADDING = 8;
var SCALE_SELECT_PADDING = 22; var SCALE_SELECT_PADDING = 22;
var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading'; var PAGE_NUMBER_LOADING_INDICATOR = 'visiblePageIsLoading';
var DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT = 5000;
//#if B2G //#if B2G
//PDFJS.useOnlyCssZoom = true; //PDFJS.useOnlyCssZoom = true;
//PDFJS.disableTextLayer = true; //PDFJS.disableTextLayer = true;
@ -855,6 +856,24 @@ var PDFViewerApplication = {
// increases. // increases.
if (percent > this.loadingBar.percent || isNaN(percent)) { if (percent > this.loadingBar.percent || isNaN(percent)) {
this.loadingBar.percent = percent; this.loadingBar.percent = percent;
// When disableAutoFetch is enabled, it's not uncommon for the entire file
// to never be fetched (depends on e.g. the file structure). In this case
// the loading bar will not be completely filled, nor will it be hidden.
// To prevent displaying a partially filled loading bar permanently, we
// hide it when no data has been loaded during a certain amount of time.
if (PDFJS.disableAutoFetch && percent) {
if (this.disableAutoFetchLoadingBarTimeout) {
clearTimeout(this.disableAutoFetchLoadingBarTimeout);
this.disableAutoFetchLoadingBarTimeout = null;
}
this.loadingBar.show();
this.disableAutoFetchLoadingBarTimeout = setTimeout(function () {
this.loadingBar.hide();
this.disableAutoFetchLoadingBarTimeout = null;
}.bind(this), DISABLE_AUTO_FETCH_LOADING_BAR_TIMEOUT);
}
} }
}, },