Add a progressbar to the loading indicator, below the text.

This commit is contained in:
gigaherz 2012-03-21 23:36:10 +01:00
parent 8ee818ec03
commit d2f463bf7c
3 changed files with 75 additions and 4 deletions

View File

@ -391,11 +391,29 @@ canvas {
}
}
#loading {
#loadingBox {
margin: 100px 0;
text-align: center;
}
#loadingBar {
display: inline-block;
border: 1px solid black;
clear: both;
padding: 1px;
margin:0px;
}
#loadingBar #progress {
background-color: green;
display: inline-block;
}
#loadingBar #remaining {
background-color: #333;
display: inline-block;
}
#PDFBug {
font-size: 10px;
position: fixed;

View File

@ -142,7 +142,10 @@
</div>
</div>
<div id="loading">Loading... 0%</div>
<div id="loadingBox">
<div id="loading">Loading... 0%</div>
<div id="loadingBar"><div id="progress"></div><div id="remaining"></div></div>
</div>
<div id="viewer"></div>
</body>
</html>

View File

@ -27,6 +27,49 @@ var Cache = function cacheCache(size) {
};
};
var ProgressBar = (function ProgressBarClosure() {
function clamp(v, min, max) {
return Math.min(Math.max(v, min), max);
}
function sizeBar(bar, num, width, height, units) {
var progress = bar.querySelector('#progress');
var remaining = bar.querySelector('#remaining');
progress.style.height=height + units;
remaining.style.height=height + units;
progress.style.width=num + units;
remaining.style.width=(width - num) + units;
}
function ProgressBar(element, min, max, width, height, units) {
this.element = element;
this.min = min;
this.max = max;
this.width = width;
this.height = height;
this.units = units;
this.value = min;
sizeBar(element, 0, this.width, this.height, this.units);
}
ProgressBar.prototype = {
constructor: ProgressBar,
get value() {
return this._value;
},
set value(val) {
this._value = clamp(val, this.min, this.max);
var num = this.width * (val - this.min) / (this.max - this.min);
sizeBar(this.element, num, this.width, this.height, this.units);
}
};
return ProgressBar;
})();
var RenderingQueue = (function RenderingQueueClosure() {
function RenderingQueue() {
this.items = [];
@ -260,6 +303,11 @@ var PDFView = {
open: function pdfViewOpen(url, scale) {
document.title = this.url = url;
// FIXME: Probably needs a better place to get initialized
if(!PDFView.loadingProgress) {
PDFView.loadingProgress = new ProgressBar(document.getElementById('loadingBar'), 0, 100, 15, 1.5, 'em');
}
var self = this;
PDFJS.getPdf(
{
@ -400,6 +448,8 @@ var PDFView = {
var percent = Math.round(level * 100);
var loadingIndicator = document.getElementById('loading');
loadingIndicator.textContent = 'Loading... ' + percent + '%';
PDFView.loadingProgress.value = percent;
},
load: function pdfViewLoad(data, scale) {
@ -414,8 +464,8 @@ var PDFView = {
var errorWrapper = document.getElementById('errorWrapper');
errorWrapper.setAttribute('hidden', 'true');
var loadingIndicator = document.getElementById('loading');
loadingIndicator.setAttribute('hidden', 'true');
var loadingBox = document.getElementById('loadingBox');
loadingBox.setAttribute('hidden', 'true');
var sidebar = document.getElementById('sidebarView');
sidebar.parentNode.scrollTop = 0;