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

Adds support of the indeterminate loading progress

Browse Source
This commit is contained in:
Yury Delendik 2012-08-22 10:48:56 -05:00
parent da861bef30
commit cd1a645881
4 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/firefox/components/PdfStreamConverter.js
View File

@ -145,6 +145,7 @@ PdfDataListener.prototype = {
}
this.data.set(chunk, this.loaded);
this.loaded = willBeLoaded;
this.onprogress(this.loaded);
} else {
this.data.set(chunk, offset);
this.loaded = offset + chunk.length;

10
src/worker.js
View File

@ -135,12 +135,10 @@ var WorkerMessageHandler = {
{
url: source.url,
progress: function getPDFProgress(evt) {
if (evt.lengthComputable) {
handler.send('DocProgress', {
loaded: evt.loaded,
total: evt.total
});
}
handler.send('DocProgress', {
loaded: evt.loaded,
total: evt.lengthComputable ? evt.total : void(0)
});
},
error: function getPDFError(e) {
handler.send('DocError', 'Unexpected server response of ' +

22
web/viewer.css
View File

@ -1025,6 +1025,28 @@ canvas {
border-bottom-right-radius: 2px;
}
#loadingBar .progress.indeterminate {
width: 100%;
height: 25px;
background-image: -moz-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
background-image: -webkit-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
background-image: -ms-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
background-image: -o-linear-gradient( 30deg, #404040, #404040 15%, #898989, #404040 85%, #404040);
background-size: 75px 25px;
-moz-animation: progressIndeterminate 1s linear infinite;
-webkit-animation: progressIndeterminate 1s linear infinite;
}
@-moz-keyframes progressIndeterminate {
from { background-position: 0px 0px; }
to { background-position: 75px 0px; }
}
@-webkit-keyframes progressIndeterminate {
from { background-position: 0px 0px; }
to { background-position: 75px 0px; }
}
.textLayer {
position: absolute;
left: 0;

14
web/viewer.js
View File

@ -60,7 +60,6 @@ var ProgressBar = (function ProgressBarClosure() {
this.height = opts.height || 100;
this.width = opts.width || 100;
this.units = opts.units || '%';
this.percent = opts.percent || 0;
// Initialize heights
this.div.style.height = this.height + this.units;
@ -69,10 +68,18 @@ var ProgressBar = (function ProgressBarClosure() {
ProgressBar.prototype = {
updateBar: function ProgressBar_updateBar() {
if (this._indeterminate) {
this.div.classList.add('indeterminate');
return;
}
var progressSize = this.width * this._percent / 100;
if (this._percent > 95)
this.div.classList.add('full');
else
this.div.classList.remove('full');
this.div.classList.remove('indeterminate');
this.div.style.width = progressSize + this.units;
},
@ -82,6 +89,7 @@ var ProgressBar = (function ProgressBarClosure() {
},
set percent(val) {
this._indeterminate = isNaN(val);
this._percent = clamp(val, 0, 100);
this.updateBar();
}
@ -572,6 +580,10 @@ var PDFView = {
}
}
}
var loadingBox = document.getElementById('loadingBox');
loadingBox.setAttribute('hidden', 'true');
//#if !(FIREFOX || MOZCENTRAL)
var errorWrapper = document.getElementById('errorWrapper');
errorWrapper.removeAttribute('hidden');