mirrors/calibre-web
1
0
Fork 0
mirror of https://github.com/janeczku/calibre-web synced 2024-11-28 20:39:59 +00:00
Code Issues Releases Wiki Activity

Code cosmetics

Browse Source
This commit is contained in:
OzzieIsaacs 2017-11-22 22:08:29 +01:00
parent 0943d50876
commit 03ab03f06e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
*/ */
/* global screenfull */ /* global screenfull */
var start = 0; // var start = 0;
if (window.opera) { if (window.opera) {
window.console.log = function(str) { window.console.log = function(str) {
@ -271,7 +271,7 @@ kthoom.setProgressMeter = function(pct, optLabel) {
//getElem('nav').className = ''; //getElem('nav').className = '';
getElem("progress").className = ""; getElem("progress").className = "";
} }
} };
function loadFromArrayBuffer(ab) { function loadFromArrayBuffer(ab) {
var f = []; var f = [];
@ -301,7 +301,7 @@ function loadFromArrayBuffer(ab) {
if (imageFiles.length === currentImage + 1) { if (imageFiles.length === currentImage + 1) {
updatePage(); updatePage();
} }
}; }
function updatePage() { function updatePage() {
@ -449,7 +449,7 @@ function updateScale(clear) {
var maxheight = innerHeight - 50; var maxheight = innerHeight - 50;
if (!clear) { if (!clear) {
switch(settings.fitMode) { switch (settings.fitMode) {
case kthoom.Key.B: case kthoom.Key.B:
mainImageStyle.maxWidth = "100%"; mainImageStyle.maxWidth = "100%";
mainImageStyle.maxHeight = maxheight + "px"; mainImageStyle.maxHeight = maxheight + "px";
@ -556,7 +556,7 @@ function ImageLoadCallback() {
} }
} }
function init(fileid) { function init(fileid) {
start = (new Date).getTime(); // start = (new Date).getTime();
var request = new XMLHttpRequest(); var request = new XMLHttpRequest();
request.open("GET", fileid); request.open("GET", fileid);
request.responseType = "json"; request.responseType = "json";
@ -611,7 +611,7 @@ function init(fileid) {
// Fullscreen mode // Fullscreen mode
if (typeof screenfull !== "undefined") { if (typeof screenfull !== "undefined") {
$("#fullscreen").click(function(evt) { $("#fullscreen").click(function() {
screenfull.toggle($("#container")[0]); screenfull.toggle($("#container")[0]);
}); });
@ -634,8 +634,8 @@ function init(fileid) {
var comicHeight = evt.target.clientHeight; var comicHeight = evt.target.clientHeight;
var offsetX = (mainContentWidth - comicWidth) / 2; var offsetX = (mainContentWidth - comicWidth) / 2;
var offsetY = (mainContentHeight - comicHeight) / 2; var offsetY = (mainContentHeight - comicHeight) / 2;
var clickX = !!evt.offsetX ? evt.offsetX : (evt.clientX - offsetX); var clickX = evt.offsetX ? evt.offsetX : (evt.clientX - offsetX);
var clickY = !!evt.offsetY ? evt.offsetY : (evt.clientY - offsetY); var clickY = evt.offsetY ? evt.offsetY : (evt.clientY - offsetY);
// Determine if the user clicked/tapped the left side or the // Determine if the user clicked/tapped the left side or the
// right side of the page. // right side of the page.

2
cps/web.py
View File

@ -838,7 +838,7 @@ def feed_series(book_id):
off = request.args.get("offset") off = request.args.get("offset")
if not off: if not off:
off = 0 off = 0
entries, random, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1), entries, __, pagination = fill_indexpage((int(off) / (int(config.config_books_per_page)) + 1),
db.Books, db.Books.series.any(db.Series.id == book_id),db.Books.series_index) db.Books, db.Books.series.any(db.Series.id == book_id),db.Books.series_index)
xml = render_title_template('feed.xml', entries=entries, pagination=pagination) xml = render_title_template('feed.xml', entries=entries, pagination=pagination)
response = make_response(xml) response = make_response(xml)