Update to ES5 standards
Also fix ESLint issues
This commit is contained in:
Jonathan Rehm
parent
29e2658e53
commit
8171943b8e
@ -1,7 +1,6 @@
|
||||
{
|
||||
"env": {
|
||||
"browser": true,
|
||||
"es6": true,
|
||||
"jquery": true
|
||||
},
|
||||
"globals": {
|
||||
@ -83,6 +82,8 @@
|
||||
2,
|
||||
"always"
|
||||
],
|
||||
"space-before-blocks": 2,
|
||||
"space-infix-ops": 2,
|
||||
"space-unary-ops": 2,
|
||||
"use-isnan": 2,
|
||||
"valid-typeof": 2,
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
$( document ).ready(function() {
|
||||
/* global _ */
|
||||
|
||||
$(function() {
|
||||
$("#have_read_form").ajaxForm();
|
||||
});
|
||||
|
||||
@ -6,34 +8,51 @@ $("#have_read_cb").on("change", function() {
|
||||
$(this).closest("form").submit();
|
||||
});
|
||||
|
||||
(function() {
|
||||
var templates = {
|
||||
add: _.template(
|
||||
$("#template-shelf-add").html()
|
||||
),
|
||||
remove: _.template(
|
||||
$("#template-shelf-remove").html()
|
||||
)
|
||||
};
|
||||
|
||||
$("#shelf-actions").on("click", "[data-shelf-action]", function (e) {
|
||||
e.preventDefault();
|
||||
|
||||
$.get(this.href)
|
||||
.done(() => {
|
||||
const $this = $(this);
|
||||
.done(function() {
|
||||
var $this = $(this);
|
||||
switch ($this.data("shelf-action")) {
|
||||
case "add":
|
||||
$("#remove-from-shelves").append(`<a href="${$this.data("remove-href")}"
|
||||
data-add-href="${this.href}"
|
||||
class="btn btn-sm btn-default" data-shelf-action="remove"
|
||||
><span class="glyphicon glyphicon-remove"></span> ${this.textContent}</a>`);
|
||||
$("#remove-from-shelves").append(
|
||||
templates.remove({
|
||||
add: this.href,
|
||||
remove: $this.data("remove-href"),
|
||||
content: this.textContent
|
||||
})
|
||||
);
|
||||
break;
|
||||
case "remove":
|
||||
$("#add-to-shelves").append(`<li><a href="${$this.data("add-href")}"
|
||||
data-remove-href="${this.href}"
|
||||
data-shelf-action="add"
|
||||
>${this.textContent}</a></li>`);
|
||||
$("#add-to-shelves").append(
|
||||
templates.add({
|
||||
add: $this.data("add-href"),
|
||||
remove: this.href,
|
||||
content: this.textContent
|
||||
})
|
||||
);
|
||||
break;
|
||||
}
|
||||
this.parentNode.removeChild(this);
|
||||
})
|
||||
.fail((xhr) => {
|
||||
const $msg = $("<span/>", { "class": "text-danger"}).text(xhr.responseText);
|
||||
}.bind(this))
|
||||
.fail(function(xhr) {
|
||||
var $msg = $("<span/>", { "class": "text-danger"}).text(xhr.responseText);
|
||||
$("#shelf-action-status").html($msg);
|
||||
|
||||
setTimeout(() => {
|
||||
setTimeout(function() {
|
||||
$msg.remove();
|
||||
}, 10000);
|
||||
});
|
||||
});
|
||||
})();
|
||||
|
||||
@ -49,7 +49,7 @@ function getPath(){
|
||||
|
||||
var authors = new Bloodhound({
|
||||
name: "authors",
|
||||
datumTokenizer(datum) {
|
||||
datumTokenizer: function datumTokenizer(datum) {
|
||||
return [datum.name];
|
||||
},
|
||||
queryTokenizer: Bloodhound.tokenizers.whitespace,
|
||||
@ -60,15 +60,15 @@ var authors = new Bloodhound({
|
||||
|
||||
var series = new Bloodhound({
|
||||
name: "series",
|
||||
datumTokenizer(datum) {
|
||||
datumTokenizer: function datumTokenizer(datum) {
|
||||
return [datum.name];
|
||||
},
|
||||
queryTokenizer(query) {
|
||||
queryTokenizer: function queryTokenizer(query) {
|
||||
return [query];
|
||||
},
|
||||
remote: {
|
||||
url: getPath()+"/get_series_json?q=",
|
||||
replace(url, query) {
|
||||
replace: function replace(url, query) {
|
||||
return url+encodeURIComponent(query);
|
||||
}
|
||||
}
|
||||
@ -77,10 +77,10 @@ var series = new Bloodhound({
|
||||
|
||||
var tags = new Bloodhound({
|
||||
name: "tags",
|
||||
datumTokenizer(datum) {
|
||||
datumTokenizer: function datumTokenizer(datum) {
|
||||
return [datum.name];
|
||||
},
|
||||
queryTokenizer(query) {
|
||||
queryTokenizer: function queryTokenizer(query) {
|
||||
var tokens = query.split(",");
|
||||
tokens = [tokens[tokens.length-1].trim()];
|
||||
return tokens;
|
||||
@ -92,15 +92,15 @@ var tags = new Bloodhound({
|
||||
|
||||
var languages = new Bloodhound({
|
||||
name: "languages",
|
||||
datumTokenizer(datum) {
|
||||
datumTokenizer: function datumTokenizer(datum) {
|
||||
return [datum.name];
|
||||
},
|
||||
queryTokenizer(query) {
|
||||
queryTokenizer: function queryTokenizer(query) {
|
||||
return [query];
|
||||
},
|
||||
remote: {
|
||||
url: getPath()+"/get_languages_json?q=",
|
||||
replace(url, query) {
|
||||
replace: function replace(url, query) {
|
||||
return url+encodeURIComponent(query);
|
||||
}
|
||||
}
|
||||
@ -135,10 +135,11 @@ var promiseAuthors = authors.initialize();
|
||||
}, {
|
||||
name: "authors",
|
||||
displayKey: "name",
|
||||
source(query, cb){
|
||||
source: function source(query, cb) {
|
||||
return sourceSplit(query, cb, "&", authors); //sourceSplit //("&")
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
var promiseSeries = series.initialize();
|
||||
@ -164,10 +165,11 @@ var promiseTags = tags.initialize();
|
||||
}, {
|
||||
name: "tags",
|
||||
displayKey: "name",
|
||||
source(query, cb){
|
||||
source: function source(query, cb) {
|
||||
return sourceSplit(query, cb, ",", tags);
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
var promiseLanguages = languages.initialize();
|
||||
@ -179,10 +181,11 @@ var promiseLanguages = languages.initialize();
|
||||
}, {
|
||||
name: "languages",
|
||||
displayKey: "name",
|
||||
source(query, cb){
|
||||
source: function source(query, cb) {
|
||||
return sourceSplit(query, cb, ",", languages); //(",")
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
$("#search").on("change input.typeahead:selected", function() {
|
||||
@ -193,8 +196,7 @@ $("#search").on("change input.typeahead:selected", function(){
|
||||
if (!($(this).hasClass("active"))) {
|
||||
$(this).addClass("disabled");
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$(this).removeClass("disabled");
|
||||
}
|
||||
});
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
var dbResults = [];
|
||||
var ggResults = [];
|
||||
|
||||
$(document).ready(function () {
|
||||
$(function () {
|
||||
var msg = i18nMsg;
|
||||
var douban = "https://api.douban.com";
|
||||
var dbSearch = "/v2/book/search";
|
||||
@ -22,9 +22,6 @@ $(document).ready(function () {
|
||||
var ggDone = false;
|
||||
|
||||
var showFlag = 0;
|
||||
String.prototype.replaceAll = function (s1, s2) {
|
||||
return this.replace(new RegExp(s1, "gm"), s2);
|
||||
};
|
||||
|
||||
function showResult () {
|
||||
var book;
|
||||
@ -32,11 +29,11 @@ $(document).ready(function () {
|
||||
var bookHtml;
|
||||
showFlag++;
|
||||
if (showFlag === 1) {
|
||||
$("#metaModal #meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
|
||||
$("#meta-info").html("<ul id=\"book-list\" class=\"media-list\"></ul>");
|
||||
}
|
||||
if (ggDone && dbDone) {
|
||||
if (!ggResults && !dbResults) {
|
||||
$("#metaModal #meta-info").html("<p class=\"text-danger\">"+ msg.no_result +"</p>");
|
||||
$("#meta-info").html("<p class=\"text-danger\">"+ msg.no_result +"</p>");
|
||||
return;
|
||||
}
|
||||
}
|
||||
@ -62,7 +59,7 @@ $(document).ready(function () {
|
||||
"<p>"+ msg.source + ":<a href=\"https://books.google.com\" target=\"_blank\">Google Books</a></p>" +
|
||||
"</div>" +
|
||||
"</li>";
|
||||
$("#metaModal #book-list").append(bookHtml);
|
||||
$("#book-list").append(bookHtml);
|
||||
}
|
||||
ggDone = false;
|
||||
}
|
||||
@ -82,24 +79,22 @@ $(document).ready(function () {
|
||||
"<p>" + msg.source + ":<a href=\"https://book.douban.com\" target=\"_blank\">Douban Books</a></p>" +
|
||||
"</div>" +
|
||||
"</li>";
|
||||
$("#metaModal #book-list").append(bookHtml);
|
||||
$("#book-list").append(bookHtml);
|
||||
}
|
||||
dbDone = false;
|
||||
}
|
||||
}
|
||||
|
||||
function ggSearchBook (title) {
|
||||
title = title.replaceAll(/\s+/, "+");
|
||||
var url = google + ggSearch + "?q=" + title;
|
||||
$.ajax({
|
||||
url,
|
||||
url: google + ggSearch + "?q=" + title.replace(/\s+/gm, "+"),
|
||||
type: "GET",
|
||||
dataType: "jsonp",
|
||||
jsonp: "callback",
|
||||
success (data) {
|
||||
success: function success(data) {
|
||||
ggResults = data.items;
|
||||
},
|
||||
complete () {
|
||||
complete: function complete() {
|
||||
ggDone = true;
|
||||
showResult();
|
||||
}
|
||||
@ -107,19 +102,18 @@ $(document).ready(function () {
|
||||
}
|
||||
|
||||
function dbSearchBook (title) {
|
||||
var url = douban + dbSearch + "?q=" + title + "&fields=all&count=10";
|
||||
$.ajax({
|
||||
url,
|
||||
url: douban + dbSearch + "?q=" + title + "&fields=all&count=10",
|
||||
type: "GET",
|
||||
dataType: "jsonp",
|
||||
jsonp: "callback",
|
||||
success (data) {
|
||||
success: function success(data) {
|
||||
dbResults = data.books;
|
||||
},
|
||||
error () {
|
||||
$("#metaModal #meta-info").html("<p class=\"text-danger\">"+ msg.search_error+"!</p>");
|
||||
error: function error() {
|
||||
$("#meta-info").html("<p class=\"text-danger\">"+ msg.search_error+"!</p>");
|
||||
},
|
||||
complete () {
|
||||
complete: function complete() {
|
||||
dbDone = true;
|
||||
showResult();
|
||||
}
|
||||
@ -128,7 +122,7 @@ $(document).ready(function () {
|
||||
|
||||
function doSearch (keyword) {
|
||||
showFlag = 0;
|
||||
$("#metaModal #meta-info").text(msg.loading);
|
||||
$("#meta-info").text(msg.loading);
|
||||
// var keyword = $("#keyword").val();
|
||||
if (keyword) {
|
||||
dbSearchBook(keyword);
|
||||
@ -153,6 +147,7 @@ $(document).ready(function () {
|
||||
|
||||
});
|
||||
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
function getMeta (source, id) {
|
||||
var meta;
|
||||
var tags;
|
||||
@ -181,6 +176,5 @@ function getMeta (source, id) {
|
||||
}
|
||||
$("#tags").val(tags);
|
||||
$("#rating").val(Math.round(meta.rating.average / 2));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,3 @@
|
||||
var displaytext;
|
||||
var updateTimerID;
|
||||
var updateText;
|
||||
|
||||
// Generic control/related handler to show/hide fields based on a checkbox' value
|
||||
// e.g.
|
||||
// <input type="checkbox" data-control="stuff-to-show">
|
||||
@ -17,10 +13,12 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
|
||||
});
|
||||
|
||||
$(function() {
|
||||
var updateTimerID;
|
||||
var updateText;
|
||||
|
||||
// Allow ajax prefilters to be added/removed dynamically
|
||||
// eslint-disable-next-line new-cap
|
||||
const preFilters = $.Callbacks();
|
||||
var preFilters = $.Callbacks();
|
||||
$.ajaxPrefilter(preFilters.fire);
|
||||
|
||||
function restartTimer() {
|
||||
@ -32,23 +30,23 @@ $(function() {
|
||||
$.ajax({
|
||||
dataType: "json",
|
||||
url: window.location.pathname + "/../../get_updater_status",
|
||||
success(data) {
|
||||
success: function success(data) {
|
||||
// console.log(data.status);
|
||||
$("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]);
|
||||
$("#Updatecontent").html(updateText[data.status]);
|
||||
if (data.status > 6) {
|
||||
clearInterval(updateTimerID);
|
||||
$("#spinner2").hide();
|
||||
$("#UpdateprogressDialog #updateFinished").removeClass("hidden");
|
||||
$("#updateFinished").removeClass("hidden");
|
||||
$("#check_for_update").removeClass("hidden");
|
||||
$("#perform_update").addClass("hidden");
|
||||
}
|
||||
},
|
||||
error() {
|
||||
error: function error() {
|
||||
// console.log('Done');
|
||||
clearInterval(updateTimerID);
|
||||
$("#spinner2").hide();
|
||||
$("#UpdateprogressDialog #Updatecontent").html(updateText[7]);
|
||||
$("#UpdateprogressDialog #updateFinished").removeClass("hidden");
|
||||
$("#Updatecontent").html(updateText[7]);
|
||||
$("#updateFinished").removeClass("hidden");
|
||||
$("#check_for_update").removeClass("hidden");
|
||||
$("#perform_update").addClass("hidden");
|
||||
},
|
||||
@ -70,7 +68,7 @@ $(function() {
|
||||
// selector for the NEXT link (to page 2)
|
||||
itemSelector : ".load-more .book",
|
||||
animate : true,
|
||||
extraScrollPx: 300,
|
||||
extraScrollPx: 300
|
||||
// selector for all items you'll retrieve
|
||||
}, function(data) {
|
||||
$(".load-more .row").isotope( "appended", $(data), null );
|
||||
@ -86,10 +84,10 @@ $(function() {
|
||||
dataType: "json",
|
||||
url: window.location.pathname + "/../../shutdown",
|
||||
data: {"parameter":0},
|
||||
success(data) {
|
||||
success: function success() {
|
||||
$("#spinner").show();
|
||||
displaytext=data.text;
|
||||
setTimeout(restartTimer, 3000);}
|
||||
setTimeout(restartTimer, 3000);
|
||||
}
|
||||
});
|
||||
});
|
||||
$("#shutdown").click(function() {
|
||||
@ -97,23 +95,26 @@ $(function() {
|
||||
dataType: "json",
|
||||
url: window.location.pathname + "/../../shutdown",
|
||||
data: {"parameter":1},
|
||||
success(data) {
|
||||
return alert(data.text);}
|
||||
success: function success(data) {
|
||||
return alert(data.text);
|
||||
}
|
||||
});
|
||||
});
|
||||
$("#check_for_update").click(function() {
|
||||
var buttonText = $("#check_for_update").html();
|
||||
$("#check_for_update").html("...");
|
||||
var $this = $(this);
|
||||
var buttonText = $this.html();
|
||||
$this.html("...");
|
||||
$.ajax({
|
||||
dataType: "json",
|
||||
url: window.location.pathname + "/../../get_update_status",
|
||||
success(data) {
|
||||
$("#check_for_update").html(buttonText);
|
||||
success: function success(data) {
|
||||
$this.html(buttonText);
|
||||
if (data.status === true) {
|
||||
$("#check_for_update").addClass("hidden");
|
||||
$("#perform_update").removeClass("hidden");
|
||||
$("#update_info").removeClass("hidden");
|
||||
$("#update_info").find("span").html(data.commit);
|
||||
$("#update_info")
|
||||
.removeClass("hidden")
|
||||
.find("span").html(data.commit);
|
||||
}
|
||||
}
|
||||
});
|
||||
@ -132,11 +133,12 @@ $(function() {
|
||||
dataType: "json",
|
||||
data: { start: "True"},
|
||||
url: window.location.pathname + "/../../get_updater_status",
|
||||
success(data) {
|
||||
success: function success(data) {
|
||||
updateText = data.text;
|
||||
$("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]);
|
||||
$("#Updatecontent").html(updateText[data.status]);
|
||||
// console.log(data.status);
|
||||
updateTimerID=setInterval(updateTimer, 2000);}
|
||||
updateTimerID = setInterval(updateTimer, 2000);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
@ -144,10 +146,10 @@ $(function() {
|
||||
|
||||
$("#bookDetailsModal")
|
||||
.on("show.bs.modal", function(e) {
|
||||
const $modalBody = $(this).find(".modal-body");
|
||||
var $modalBody = $(this).find(".modal-body");
|
||||
|
||||
// Prevent static assets from loading multiple times
|
||||
const useCache = (options) => {
|
||||
var useCache = function(options) {
|
||||
options.async = true;
|
||||
options.cache = true;
|
||||
};
|
||||
@ -162,7 +164,7 @@ $(function() {
|
||||
$(this).find(".modal-body").html("...");
|
||||
});
|
||||
|
||||
$(window).resize(function(event) {
|
||||
$(window).resize(function() {
|
||||
$(".discover .row").isotope("reLayout");
|
||||
});
|
||||
});
|
||||
@ -1,10 +1,11 @@
|
||||
/* global Sortable,sortTrue */
|
||||
|
||||
var sortable = Sortable.create(sortTrue, {
|
||||
Sortable.create(sortTrue, {
|
||||
group: "sorting",
|
||||
sort: true
|
||||
});
|
||||
|
||||
// eslint-disable-next-line no-unused-vars
|
||||
function sendData(path) {
|
||||
var elements;
|
||||
var counter;
|
||||
@ -18,13 +19,12 @@ function sendData(path){
|
||||
form.setAttribute("method", "post");
|
||||
form.setAttribute("action", path);
|
||||
|
||||
|
||||
for (counter = 0;counter < maxElements;counter++) {
|
||||
tmp[counter] = elements[counter].getAttribute("id");
|
||||
var hiddenField = document.createElement("input");
|
||||
hiddenField.setAttribute("type", "hidden");
|
||||
hiddenField.setAttribute("name", elements[counter].getAttribute("id"));
|
||||
hiddenField.setAttribute("value", counter+1);
|
||||
hiddenField.setAttribute("value", String(counter + 1));
|
||||
form.appendChild(hiddenField);
|
||||
}
|
||||
document.body.appendChild(form);
|
||||
|
||||
@ -139,7 +139,7 @@
|
||||
<div class="modal-header bg-danger text-center">
|
||||
<span>{{_('Are really you sure?')}}</span>
|
||||
</div>
|
||||
<div class="modal-body text-center" id="meta-info">
|
||||
<div class="modal-body text-center">
|
||||
<span>{{_('Book will be deleted from Calibre database')}}</span>
|
||||
<span>{{_('and from hard disk')}}</span>
|
||||
</div>
|
||||
|
||||
@ -259,5 +259,17 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block js %}
|
||||
<script type="text/template" id="template-shelf-add">
|
||||
<li>
|
||||
<a href="<%= add %>" data-remove-href="<%= remove %>" data-shelf-action="add">
|
||||
<%= content %>
|
||||
</a>
|
||||
</li>
|
||||
</script>
|
||||
<script type="text/template" id="template-shelf-remove">
|
||||
<a href="<%= remove %>" data-add-href="<%= add %>" class="btn btn-sm btn-default" data-shelf-action="remove">
|
||||
<span class="glyphicon glyphicon-remove"></span> <%= content %>
|
||||
</a>
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/details.js') }}"></script>
|
||||
{% endblock %}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user