mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-19 00:04:54 +00:00
Code Issues Releases Wiki Activity

Code cosmetics

Browse Source 
Bugfix "Error load settings"
This commit is contained in:
OzzieIsaacs 2017-09-18 18:59:08 +02:00
parent 378a0ca662
commit 0405cec4ac
3 changed files with 198 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
cps/static/js/io.js
View File

@ -30,20 +30,20 @@ bitjs.io = bitjs.io || {};
* @param {ArrayBuffer} ab An ArrayBuffer object or a Uint8Array.
* @param {boolean} rtl Whether the stream reads bits from the byte starting
* from bit 7 to 0 (true) or bit 0 to 7 (false).
* @param {Number} opt_offset The offset into the ArrayBuffer
* @param {Number} opt_length The length of this BitStream
* @param {Number} optOffset The offset into the ArrayBuffer
* @param {Number} optLength The length of this BitStream
*/
bitjs.io.BitStream = function(ab, rtl, opt_offset, opt_length) {
bitjs.io.BitStream = function(ab, rtl, optOffset, optLength) {
if (!ab || !ab.toString || ab.toString() !== "[object ArrayBuffer]") {
throw "Error! BitArray constructed with an invalid ArrayBuffer object";
}
var offset = opt_offset || 0;
var length = opt_length || ab.byteLength;
var offset = optOffset || 0;
var length = optLength || ab.byteLength;
this.bytes = new Uint8Array(ab, offset, length);
this.bytePtr = 0; // tracks which byte we are on
this.bitPtr = 0; // tracks which bit we are on (can have values 0 through 7)
this.peekBits = rtl ? this.peekBits_rtl : this.peekBits_ltr;
this.peekBits = rtl ? this.peekBitsRtl : this.peekBitsLtr;
};
@ -57,12 +57,12 @@ bitjs.io = bitjs.io || {};
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
* @return {number} The peeked bits, as an unsigned number.
*/
bitjs.io.BitStream.prototype.peekBits_ltr = function(n, movePointers) {
bitjs.io.BitStream.prototype.peekBitsLtr = function(n, movePointers) {
if (n <= 0 || typeof n != typeof 1) {
return 0;
}
var movePointers = movePointers || false,
movePointers = movePointers || false,
bytePtr = this.bytePtr,
bitPtr = this.bitPtr,
result = 0,
@ -77,21 +77,20 @@ bitjs.io = bitjs.io || {};
if (bytePtr >= bytes.length) {
throw "Error! Overflowed the bit stream! n=" + n + ", bytePtr=" + bytePtr + ", bytes.length=" +
bytes.length + ", bitPtr=" + bitPtr;
return -1;
}
var numBitsLeftInThisByte = (8 - bitPtr);
var mask;
if (n >= numBitsLeftInThisByte) {
var mask = (BITMASK[numBitsLeftInThisByte] << bitPtr);
mask = (BITMASK[numBitsLeftInThisByte] << bitPtr);
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
bytePtr++;
bitPtr = 0;
bitsIn += numBitsLeftInThisByte;
n -= numBitsLeftInThisByte;
}
else {
var mask = (BITMASK[n] << bitPtr);
} else {
mask = (BITMASK[n] << bitPtr);
result |= (((bytes[bytePtr] & mask) >> bitPtr) << bitsIn);
bitPtr += n;
@ -119,7 +118,7 @@ bitjs.io = bitjs.io || {};
* @param {boolean=} movePointers Whether to move the pointer, defaults false.
* @return {number} The peeked bits, as an unsigned number.
*/
bitjs.io.BitStream.prototype.peekBits_rtl = function(n, movePointers) {
bitjs.io.BitStream.prototype.peekBitsRtl = function(n, movePointers) {
if (n <= 0 || typeof n != typeof 1) {
return 0;
}
@ -203,11 +202,11 @@ bitjs.io = bitjs.io || {};
// from http://tools.ietf.org/html/rfc1951#page-11
// "Any bits of input up to the next byte boundary are ignored."
while (this.bitPtr != 0) {
while (this.bitPtr !== 0) {
this.readBits(1);
}
var movePointers = movePointers || false;
movePointers = movePointers || false;
var bytePtr = this.bytePtr,
bitPtr = this.bitPtr;
@ -235,13 +234,13 @@ bitjs.io = bitjs.io || {};
* out of an ArrayBuffer. In this buffer, everything must be byte-aligned.
*
* @param {ArrayBuffer} ab The ArrayBuffer object.
* @param {number=} opt_offset The offset into the ArrayBuffer
* @param {number=} opt_length The length of this BitStream
* @param {number=} optOffset The offset into the ArrayBuffer
* @param {number=} optLength The length of this BitStream
* @constructor
*/
bitjs.io.ByteStream = function(ab, opt_offset, opt_length) {
var offset = opt_offset || 0;
var length = opt_length || ab.byteLength;
bitjs.io.ByteStream = function(ab, optOffset, optLength) {
var offset = optOffset || 0;
var length = optLength || ab.byteLength;
this.bytes = new Uint8Array(ab, offset, length);
this.ptr = 0;
};
@ -256,8 +255,9 @@ bitjs.io = bitjs.io || {};
*/
bitjs.io.ByteStream.prototype.peekNumber = function(n) {
// TODO: return error if n would go past the end of the stream?
if (n <= 0 || typeof n != typeof 1)
if (n <= 0 || typeof n !== typeof 1){
return -1;
}
var result = 0;
// read from last byte to first byte and roll them in
@ -382,7 +382,7 @@ bitjs.io = bitjs.io || {};
* @constructor
*/
bitjs.io.ByteBuffer = function(numBytes) {
if (typeof numBytes != typeof 1 || numBytes <= 0) {
if (typeof numBytes !== typeof 1 || numBytes <= 0) {
throw "Error! ByteBuffer initialized with '" + numBytes + "'";
}
this.data = new Uint8Array(numBytes);
@ -447,12 +447,12 @@ bitjs.io = bitjs.io || {};
*/
bitjs.io.ByteBuffer.prototype.writeSignedNumber = function(num, numBytes) {
if (numBytes < 1) {
throw 'Trying to write into too few bytes: ' + numBytes;
throw "Trying to write into too few bytes: " + numBytes;
}
var HALF = Math.pow(2, (numBytes * 8) - 1);
if (num >= HALF || num < -HALF) {
throw 'Trying to write ' + num + ' into only ' + numBytes + ' bytes';
throw "Trying to write " + num + "" into only " + numBytes + " bytes";
}
// Roll 8-bits at a time into an array of bytes.
@ -474,7 +474,7 @@ bitjs.io = bitjs.io || {};
for (var i = 0; i < str.length; ++i) {
var curByte = str.charCodeAt(i);
if (curByte < 0 || curByte > 255) {
throw 'Trying to write a non-ASCII string!';
throw "Trying to write a non-ASCII string!";
}
this.insertByte(curByte);
}

82
cps/static/js/kthoom.js
View File

@ -15,6 +15,7 @@
* Typed Arrays: http://www.khronos.org/registry/typedarray/specs/latest/#6
*/
/* global bitjs */
if (window.opera) {
window.console.log = function(str) {
@ -77,7 +78,8 @@ kthoom.saveSettings = function() {
kthoom.loadSettings = function() {
try {
if (localStorage.kthoomSettings.length < 10) return;
if (localStorage.kthoomSettings.length < 10)
return;
var s = JSON.parse(localStorage.kthoomSettings);
kthoom.rotateTimes = s.rotateTimes;
hflip = s.hflip;
@ -86,31 +88,31 @@ kthoom.loadSettings = function() {
} catch (err) {
alert("Error load settings");
}
}
};
var createURLFromArray = function(array, mimeType) {
var offset = array.byteOffset, len = array.byteLength;
var bb, url;
var url;
var blob;
// TODO: Move all this browser support testing to a common place
// and do it just once.
// Blob constructor, see http://dev.w3.org/2006/webapi/FileAPI/#dfn-Blob.
if (typeof Blob == "function") {
if (typeof Blob === "function") {
blob = new Blob([array], {type: mimeType});
} else {
throw "Browser support for Blobs is missing."
throw "Browser support for Blobs is missing.";
}
if (blob.slice) {
blob = blob.slice(offset, offset + len, mimeType);
} else {
throw "Browser support for Blobs is missing."
throw "Browser support for Blobs is missing.";
}
if ((typeof URL != "function" && typeof URL != "object") ||
typeof URL.createObjectURL != "function") {
if ((typeof URL !== "function" && typeof URL != "object") ||
typeof URL.createObjectURL !== "function") {
throw "Browser support for Object URLs is missing";
}
@ -217,7 +219,7 @@ kthoom.initProgressMeter = function() {
svg.appendChild(g);
pdiv.appendChild(svg);
var l;
svg.onclick = function(e) {
for (var x = pdiv, l = 0; x !== document.documentElement; x = x.parentNode) l += x.offsetLeft;
var page = Math.max(1, Math.ceil(((e.clientX - l) / pdiv.offsetWidth) * totalImages)) - 1;
@ -239,7 +241,7 @@ kthoom.setProgressMeter = function(pct, optLabel) {
if (isNaN(oldval)) oldval = 0;
var weight = 0.5;
smartpct = ((weight * smartpct) + ((1 - weight) * oldval));
if (pct == 100) smartpct = 100;
if (pct === 100) smartpct = 100;
if (!isNaN(smartpct)) {
getElem("meter").setAttribute("width", smartpct + "%");
@ -254,15 +256,15 @@ kthoom.setProgressMeter = function(pct, optLabel) {
title.appendChild(document.createTextNode(labelText));
getElem("meter2").setAttribute("width",
100 * (totalImages == 0 ? 0 : ((currentImage+1) / totalImages)) + "%");
100 * (totalImages === 0 ? 0 : ((currentImage + 1) / totalImages)) + "%");
var title = getElem("page");
while (title.firstChild) title.removeChild(title.firstChild);
title.appendChild(document.createTextNode( (currentImage+1) + '/' + totalImages ));
var titlePage = getElem("page");
while (titlePage.firstChild) titlePage.removeChild(titlePage.firstChild);
titlePage.appendChild(document.createTextNode( (currentImage + 1) + "/" + totalImages ));
if (pct > 0) {
//getElem('nav').className = '';
getElem("progress").className = '';
getElem("progress").className = "";
}
}
@ -270,9 +272,9 @@ function loadFromArrayBuffer(ab) {
var start = (new Date).getTime();
var h = new Uint8Array(ab, 0, 10);
var pathToBitJS = "../../static/js/";
if (h[0] == 0x52 && h[1] == 0x61 && h[2] == 0x72 && h[3] == 0x21) { //Rar!
if (h[0] === 0x52 && h[1] === 0x61 && h[2] === 0x72 && h[3] === 0x21) { //Rar!
unarchiver = new bitjs.archive.Unrarrer(ab, pathToBitJS);
} else if (h[0] == 80 && h[1] == 75) { //PK (Zip)
} else if (h[0] === 80 && h[1] === 75) { //PK (Zip)
unarchiver = new bitjs.archive.Unzipper(ab, pathToBitJS);
} else { // Try with tar
unarchiver = new bitjs.archive.Untarrer(ab, pathToBitJS);
@ -293,7 +295,7 @@ function loadFromArrayBuffer(ab) {
if (e.unarchivedFile) {
var f = e.unarchivedFile;
// add any new pages based on the filename
if (imageFilenames.indexOf(f.filename) == -1) {
if (imageFilenames.indexOf(f.filename) === -1) {
imageFilenames.push(f.filename);
imageFiles.push(new kthoom.ImageFile(f));
}
@ -304,7 +306,7 @@ function loadFromArrayBuffer(ab) {
}
});
unarchiver.addEventListener(bitjs.archive.UnarchiveEvent.Type.FINISH,
function(e) {
function() {
var diff = ((new Date).getTime() - start) / 1000;
console.log("Unarchiving done in " + diff + "s");
});
@ -320,7 +322,7 @@ function updatePage() {
while (title.firstChild) title.removeChild(title.firstChild);
title.appendChild(document.createTextNode( (currentImage +1 ) + "/" + totalImages ));
getElem('meter2').setAttribute('width',
getElem("meter2").setAttribute("width",
100 * (totalImages == 0 ? 0 : ((currentImage +1 ) / totalImages)) + "%");
if (imageFiles[currentImage]) {
setImage(imageFiles[currentImage].dataURI);
@ -333,21 +335,21 @@ function setImage(url) {
var canvas = $("#mainImage")[0];
var x = $("#mainImage")[0].getContext("2d");
$("#mainText").hide();
if (url == "loading") {
if (url === "loading") {
updateScale(true);
canvas.width = innerWidth - 100;
canvas.height = 200;
x.fillStyle = "red";
x.font = "50px sans-serif";
x.strokeStyle = "black";
x.fillText("Loading Page #" + (currentImage + 1), 100, 100)
x.fillText("Loading Page #" + (currentImage + 1), 100, 100);
} else {
if ($("body").css("scrollHeight")/innerHeight > 1) {
$("body").css("overflowY", "scroll");
}
var img = new Image();
img.onerror = function(e) {
img.onerror = function() {
canvas.width = innerWidth - 100;
canvas.height = 300;
updateScale(true);
@ -355,12 +357,12 @@ function setImage(url) {
x.font = "50px sans-serif";
x.strokeStyle = "black";
x.fillText("Page #" + (currentImage + 1) + " (" +
imageFiles[currentImage].filename + ")", 100, 100)
imageFiles[currentImage].filename + ")", 100, 100);
x.fillStyle = "red";
x.fillText("Is corrupt or not an image", 100, 200);
if (/(html|htm)$/.test(imageFiles[currentImage].filename)) {
var xhr = new XMLHttpRequest();
if (/(html|htm)$/.test(imageFiles[currentImage].filename)) {
xhr.open("GET", url, true);
xhr.onload = function() {
//document.getElementById('mainText').style.display = '';
@ -369,7 +371,6 @@ function setImage(url) {
}
xhr.send(null);
} else if (!/(jpg|jpeg|png|gif)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10 * 1024) {
var xhr = new XMLHttpRequest();
xhr.open("GET", url, true);
xhr.onload = function() {
$("#mainText").css("display", "");
@ -392,11 +393,11 @@ function setImage(url) {
x.rotate(Math.PI/2 * kthoom.rotateTimes);
x.translate(-w/2, -h/2);
if (vflip) {
x.scale(1, -1)
x.scale(1, -1);
x.translate(0, -h);
}
if (hflip) {
x.scale(-1, 1)
x.scale(-1, 1);
x.translate(-w, 0);
}
canvas.style.display = "none";
@ -405,7 +406,7 @@ function setImage(url) {
updateScale();
canvas.style.display = '';
canvas.style.display = "";
$("body").css("overflowY", "");
x.restore();
};
@ -434,23 +435,23 @@ function showNextPage() {
}
function updateScale(clear) {
var mainImageStyle = getElem('mainImage').style;
mainImageStyle.width = '';
mainImageStyle.height = '';
mainImageStyle.maxWidth = '';
mainImageStyle.maxHeight = '';
var mainImageStyle = getElem("mainImage").style;
mainImageStyle.width = "";
mainImageStyle.height = "";
mainImageStyle.maxWidth = "";
mainImageStyle.maxHeight = "";
var maxheight = innerHeight - 15;
if (!/main/.test(getElem('titlebar').className)) {
if (!/main/.test(getElem("titlebar").className)) {
maxheight -= 25;
}
if (clear || fitMode == kthoom.Key.N) {
} else if (fitMode == kthoom.Key.B) {
mainImageStyle.maxWidth = '100%';
mainImageStyle.maxHeight = maxheight + 'px';
mainImageStyle.maxWidth = "100%";
mainImageStyle.maxHeight = maxheight + "px";
} else if (fitMode == kthoom.Key.H) {
mainImageStyle.height = maxheight + 'px';
mainImageStyle.height = maxheight + "px";
} else if (fitMode == kthoom.Key.W) {
mainImageStyle.width = '100%';
mainImageStyle.width = "100%";
}
kthoom.saveSettings();
}
@ -458,7 +459,7 @@ function updateScale(clear) {
function keyHandler(evt) {
var code = evt.keyCode;
if ($("#progress").css('display') == "none")
if ($("#progress").css("display") == "none")
return;
canKeyNext = (($("body").css("offsetWidth")+$("body").css("scrollLeft")) / $("body").css("scrollWidth")) >= 1;
canKeyPrev = (scrollX <= 0);
@ -537,6 +538,7 @@ function init(filename) {
request.send();
kthoom.initProgressMeter();
document.body.className += /AppleWebKit/.test(navigator.userAgent) ? " webkit" : "";
updateScale(true);
kthoom.loadSettings();
$(document).keydown(keyHandler);