monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change just some reformatting.

Browse source
This commit is contained in:
JackDandy 2017-02-09 18:41:59 +00:00
parent 89ba88eb96
commit ad4d0ffd37
2 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -42,6 +42,7 @@
* Update tablesorter 2.17.7 to 2.28.5 * Update tablesorter 2.17.7 to 2.28.5
* Update jQuery 1.8.3 to 2.2.4 * Update jQuery 1.8.3 to 2.2.4
* Add one time run to start up that deletes troublemaking compiled files * Add one time run to start up that deletes troublemaking compiled files
* Fix reload of homepage after restart in some browsers
[develop changelog] [develop changelog]

63
gui/slick/js/restart.js
View file

@ -15,35 +15,37 @@ $.SickGear.numRestartWaits = 0;
function is_alive() { function is_alive() {
timeoutId = 0; timeoutId = 0;
$.ajax({url: isAliveUrl,
type: 'GET',
dataType: 'jsonp',
success: function(data) {
var resp = data.msg.toString(); //noinspection JSUnusedLocalSymbols
if ('nope' == resp) { $.ajax({
// if initialising then just wait and try again 'url': isAliveUrl,
'type': 'GET',
'dataType': 'jsonp',
'success': function(data) {
var resp = data.msg.toString();
if ('nope' == resp) {
// if initialising then just wait and try again
$('#shut_down_message').find('.spinner,.hide-yes').removeClass(); $('#shut_down_message').find('.spinner,.hide-yes').removeClass();
$('#restart_message').removeClass(); $('#restart_message').removeClass();
setTimeout(is_alive, 100);
} else if (/undefined/i.test($.SickGear.PID) || $.SickGear.PID == resp) {
// if this is before we've even shut down then just try again later
setTimeout(is_alive, 100);
} else {
// if we're ready to go then redirect to new url
$('#restart_message').find('.spinner,.hide-yes').removeClass();
$('#refresh_message').removeClass();
window.location = baseUrl + '/home/';
}
},
'error': function(XMLHttpRequest, textStatus, errorThrown) {
setTimeout(is_alive, 100); setTimeout(is_alive, 100);
} else if (/undefined/i.test($.SickGear.PID) || $.SickGear.PID == resp) {
// if this is before we've even shut down then just try again later
setTimeout(is_alive, 100);
} else {
// if we're ready to go then redirect to new url
$('#restart_message').find('.spinner,.hide-yes').removeClass();
$('#refresh_message').removeClass();
window.location = baseUrl + '/home/';
} }
},
error: function(XMLHttpRequest, textStatus, errorThrown) {
setTimeout(is_alive, 100);
}
}); });
} }
@ -56,11 +58,14 @@ $(document).ready(function() {
$.SickGear.numRestartWaits += 1; $.SickGear.numRestartWaits += 1;
$('#shut_down_message').find('.spinner,.hide-yes').removeClass(); $('#shut_down_message').find('.spinner,.hide-yes').removeClass();
$('#restart_message').removeClass();
var restart$ = $('#restart_message');
restart$.removeClass();
isAliveUrl = baseUrl + '/home/is_alive/'; isAliveUrl = baseUrl + '/home/is_alive/';
// if https is enabled or you are currently on https and the port or protocol changed just wait 5 seconds then redirect. // If using https and the port or protocol changed, then wait 5 seconds before redirect because ajax calls will
// This is because the ajax will fail if the cert is untrusted or the the http ajax request from https will fail because of mixed content error. // fail with untrusted certs or when a http ajax request is made from https with a mixed content error.
if ($.SickGear.UseHttps || 'https:' == window.location.protocol) { if ($.SickGear.UseHttps || 'https:' == window.location.protocol) {
if (browserUrl != baseUrl) { if (browserUrl != baseUrl) {
@ -78,7 +83,7 @@ $(document).ready(function() {
// if it is taking forever just give up // if it is taking forever just give up
if (90 < $.SickGear.numRestartWaits) { if (90 < $.SickGear.numRestartWaits) {
$('#restart_message').find('.spinner,.yes,.hide-no').removeClass(); restart$.find('.spinner,.yes,.hide-no').removeClass();
$('#restart_fail_message').removeClass(); $('#restart_fail_message').removeClass();
return; return;
} }