Code cosmetics

pull/346/head
OzzieIsaacs 7 years ago
parent 0405cec4ac
commit a6dfcedfdb

@ -78,8 +78,9 @@ kthoom.saveSettings = function() {
kthoom.loadSettings = function() { kthoom.loadSettings = function() {
try { try {
if (localStorage.kthoomSettings.length < 10) if (localStorage.kthoomSettings.length < 10){
return; return;
}
var s = JSON.parse(localStorage.kthoomSettings); var s = JSON.parse(localStorage.kthoomSettings);
kthoom.rotateTimes = s.rotateTimes; kthoom.rotateTimes = s.rotateTimes;
hflip = s.hflip; hflip = s.hflip;
@ -111,13 +112,13 @@ var createURLFromArray = function(array, mimeType) {
throw "Browser support for Blobs is missing."; throw "Browser support for Blobs is missing.";
} }
if ((typeof URL !== "function" && typeof URL != "object") || if ((typeof URL !== "function" && typeof URL !== "object") ||
typeof URL.createObjectURL !== "function") { typeof URL.createObjectURL !== "function") {
throw "Browser support for Object URLs is missing"; throw "Browser support for Object URLs is missing";
} }
return URL.createObjectURL(blob); return URL.createObjectURL(blob);
} };
// Stores an image filename and its data: URI. // Stores an image filename and its data: URI.
@ -301,7 +302,7 @@ function loadFromArrayBuffer(ab) {
} }
} }
// display first page if we haven't yet // display first page if we haven't yet
if (imageFiles.length == currentImage + 1) { if (imageFiles.length === currentImage + 1) {
updatePage(); updatePage();
} }
}); });
@ -320,10 +321,10 @@ function loadFromArrayBuffer(ab) {
function updatePage() { function updatePage() {
var title = getElem("page"); var title = getElem("page");
while (title.firstChild) title.removeChild(title.firstChild); while (title.firstChild) title.removeChild(title.firstChild);
title.appendChild(document.createTextNode( (currentImage +1 ) + "/" + totalImages )); title.appendChild(document.createTextNode( (currentImage + 1 ) + "/" + totalImages ));
getElem("meter2").setAttribute("width", getElem("meter2").setAttribute("width",
100 * (totalImages == 0 ? 0 : ((currentImage +1 ) / totalImages)) + "%"); 100 * (totalImages === 0 ? 0 : ((currentImage + 1 ) / totalImages)) + "%");
if (imageFiles[currentImage]) { if (imageFiles[currentImage]) {
setImage(imageFiles[currentImage].dataURI); setImage(imageFiles[currentImage].dataURI);
} else { } else {
@ -344,7 +345,7 @@ function setImage(url) {
x.strokeStyle = "black"; x.strokeStyle = "black";
x.fillText("Loading Page #" + (currentImage + 1), 100, 100); x.fillText("Loading Page #" + (currentImage + 1), 100, 100);
} else { } else {
if ($("body").css("scrollHeight")/innerHeight > 1) { if ($("body").css("scrollHeight") / innerHeight > 1) {
$("body").css("overflowY", "scroll"); $("body").css("overflowY", "scroll");
} }
@ -386,12 +387,15 @@ function setImage(url) {
sh = h; sh = h;
kthoom.rotateTimes = (4 + kthoom.rotateTimes) % 4; kthoom.rotateTimes = (4 + kthoom.rotateTimes) % 4;
x.save(); x.save();
if (kthoom.rotateTimes % 2 == 1) { sh = w; sw = h;} if (kthoom.rotateTimes % 2 === 1) {
sh = w;
sw = h;
}
canvas.height = sh; canvas.height = sh;
canvas.width = sw; canvas.width = sw;
x.translate(sw/2, sh/2); x.translate(sw / 2, sh / 2);
x.rotate(Math.PI/2 * kthoom.rotateTimes); x.rotate(Math.PI / 2 * kthoom.rotateTimes);
x.translate(-w/2, -h/2); x.translate(-w / 2, -h / 2);
if (vflip) { if (vflip) {
x.scale(1, -1); x.scale(1, -1);
x.translate(0, -h); x.translate(0, -h);
@ -435,23 +439,23 @@ function showNextPage() {
} }
function updateScale(clear) { function updateScale(clear) {
var mainImageStyle = getElem("mainImage").style; var mainImageStyle = getElem("mainImage").style;
mainImageStyle.width = ""; mainImageStyle.width = "";
mainImageStyle.height = ""; mainImageStyle.height = "";
mainImageStyle.maxWidth = ""; mainImageStyle.maxWidth = "";
mainImageStyle.maxHeight = ""; mainImageStyle.maxHeight = "";
var maxheight = innerHeight - 15; var maxheight = innerHeight - 15;
if (!/main/.test(getElem("titlebar").className)) { if (!/main/.test(getElem("titlebar").className)) {
maxheight -= 25; maxheight -= 25;
} }
if (clear || fitMode == kthoom.Key.N) { if (clear || fitMode === kthoom.Key.N) {
} else if (fitMode == kthoom.Key.B) { } else if (fitMode === kthoom.Key.B) {
mainImageStyle.maxWidth = "100%"; mainImageStyle.maxWidth = "100%";
mainImageStyle.maxHeight = maxheight + "px"; mainImageStyle.maxHeight = maxheight + "px";
} else if (fitMode == kthoom.Key.H) { } else if (fitMode === kthoom.Key.H) {
mainImageStyle.height = maxheight + "px"; mainImageStyle.height = maxheight + "px";
} else if (fitMode == kthoom.Key.W) { } else if (fitMode === kthoom.Key.W) {
mainImageStyle.width = "100%"; mainImageStyle.width = "100%";
} }
kthoom.saveSettings(); kthoom.saveSettings();
} }
@ -459,13 +463,14 @@ function updateScale(clear) {
function keyHandler(evt) { function keyHandler(evt) {
var code = evt.keyCode; var code = evt.keyCode;
if ($("#progress").css("display") == "none") if ($("#progress").css("display") === "none"){
return; return;
canKeyNext = (($("body").css("offsetWidth")+$("body").css("scrollLeft")) / $("body").css("scrollWidth")) >= 1; }
canKeyNext = (($("body").css("offsetWidth") + $("body").css("scrollLeft")) / $("body").css("scrollWidth")) >= 1;
canKeyPrev = (scrollX <= 0); canKeyPrev = (scrollX <= 0);
if (evt.ctrlKey || evt.shiftKey || evt.metaKey) return; if (evt.ctrlKey || evt.shiftKey || evt.metaKey) return;
switch(code) { switch (code) {
case kthoom.Key.LEFT: case kthoom.Key.LEFT:
if (canKeyPrev) showPrevPage(); if (canKeyPrev) showPrevPage();
break; break;
@ -489,10 +494,10 @@ function keyHandler(evt) {
case kthoom.Key.F: case kthoom.Key.F:
if (!hflip && !vflip) { if (!hflip && !vflip) {
hflip = true; hflip = true;
} else if(hflip == true) { } else if (hflip === true) {
vflip = true; vflip = true;
hflip = false; hflip = false;
} else if(vflip == true) { } else if (vflip === true) {
vflip = false; vflip = false;
} }
updatePage(); updatePage();
@ -524,10 +529,10 @@ function init(filename) {
alert("Sorry, kthoom will not work with your browser because it does not support the File API. Please try kthoom with Chrome 12+ or Firefox 7+"); alert("Sorry, kthoom will not work with your browser because it does not support the File API. Please try kthoom with Chrome 12+ or Firefox 7+");
} else { } else {
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET",filename); request.open("GET", filename);
request.responseType="arraybuffer"; request.responseType = "arraybuffer";
request.setRequestHeader("X-Test","test1"); request.setRequestHeader("X-Test", "test1");
request.setRequestHeader("X-Test","test2"); request.setRequestHeader("X-Test", "test2");
request.addEventListener("load", function(event) { request.addEventListener("load", function(event) {
if (request.status >= 200 && request.status < 300) { if (request.status >= 200 && request.status < 300) {
loadFromArrayBuffer(request.response); loadFromArrayBuffer(request.response);

Loading…
Cancel
Save