Update to ES5 standards

Also fix ESLint issues
This commit is contained in:
Jonathan Rehm
2017-08-12 22:24:56 -07:00
parent 29e2658e53
commit 8171943b8e
8 changed files with 220 additions and 190 deletions

View File

@ -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">
@ -11,16 +7,18 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
var name = $this.data("control");
var showOrHide = $this.prop("checked");
$("[data-related=\""+name+"\"]").each(function () {
$("[data-related=\"" + name + "\"]").each(function () {
$(this).toggle(showOrHide);
});
});
$(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() {
@ -30,29 +28,29 @@ $(function() {
function updateTimer() {
$.ajax({
dataType: "json",
url: window.location.pathname+"/../../get_updater_status",
success(data) {
// console.log(data.status);
$("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]);
if (data.status >6){
dataType: "json",
url: window.location.pathname + "/../../get_updater_status",
success: function success(data) {
// console.log(data.status);
$("#Updatecontent").html(updateText[data.status]);
if (data.status > 6) {
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
}
},
error: function error() {
// console.log('Done');
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#UpdateprogressDialog #updateFinished").removeClass("hidden");
$("#Updatecontent").html(updateText[7]);
$("#updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
}
},
error() {
// console.log('Done');
clearInterval(updateTimerID);
$("#spinner2").hide();
$("#UpdateprogressDialog #Updatecontent").html(updateText[7]);
$("#UpdateprogressDialog #updateFinished").removeClass("hidden");
$("#check_for_update").removeClass("hidden");
$("#perform_update").addClass("hidden");
},
timeout:2000
timeout: 2000
});
}
@ -70,13 +68,13 @@ $(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){
}, function(data) {
$(".load-more .row").isotope( "appended", $(data), null );
});
$("#sendbtn").click(function(){
$("#sendbtn").click(function() {
var $this = $(this);
$this.text("Please wait...");
$this.addClass("disabled");
@ -84,36 +82,39 @@ $(function() {
$("#restart").click(function() {
$.ajax({
dataType: "json",
url: window.location.pathname+"/../../shutdown",
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() {
$.ajax({
dataType: "json",
url: window.location.pathname+"/../../shutdown",
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);
url: window.location.pathname + "/../../get_update_status",
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);
}
}
});
@ -121,22 +122,23 @@ $(function() {
$("#restart_database").click(function() {
$.ajax({
dataType: "json",
url: window.location.pathname+"/../../shutdown",
url: window.location.pathname + "/../../shutdown",
data: {"parameter":2}
});
});
$("#perform_update").click(function() {
$("#spinner2").show();
$.ajax({
type: "POST",
dataType: "json",
data: { start: "True"},
url: window.location.pathname+"/../../get_updater_status",
success(data) {
updateText=data.text;
$("#UpdateprogressDialog #Updatecontent").html(updateText[data.status]);
// console.log(data.status);
updateTimerID=setInterval(updateTimer, 2000);}
type: "POST",
dataType: "json",
data: { start: "True"},
url: window.location.pathname + "/../../get_updater_status",
success: function success(data) {
updateText = data.text;
$("#Updatecontent").html(updateText[data.status]);
// console.log(data.status);
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");
});
});
});