monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-01 00:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #813 from JackDandy/feature/FixChkBranch

Browse source 
Fix button "Checkout branch" when stuck on disabled.
This commit is contained in:
JackDandy 2016-10-28 20:14:00 +01:00 committed by GitHub
commit 3682e004db
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -189,6 +189,7 @@
* Add advice to logs if all caches fail to switch to direct client connect instead of the basic blackhole method
* Add search setting "Disable auto full backlog"
* Change improve performance and reduce start up time
* Fix button "Checkout branch" when stuck on disabled
[develop changelog]
* Change send nzb data to NZBGet for Anizb instead of url

2
gui/slick/js/config.js
View file

@ -302,8 +302,8 @@ function fetch_branches() {
$.each(branches, function (i, text) {
add_option_to_branches(text);
});
$('#branchVersion').find('option[value=' + data['current'] + ']').attr('selected','selected');
$('#branchCheckout').removeAttr('disabled');
$('#branchVersion').find('option[value="' + data['current'] + '"]').attr('selected', 'selected');
} else {
add_option_to_branches('No branches available');
}

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

@ -22,13 +22,13 @@ function is_alive() {
$('#shut_down_message').find('.spinner,.hide-yes').removeClass();
$('#restart_message').removeClass();
setTimeout(is_alive, 250);
setTimeout(is_alive, 100);
} else if ('' == $.SickGear.currentPid || $.SickGear.currentPid == data.msg) {
// if this is before we've even shut down then just try again later
$.SickGear.currentPid = data.msg;
setTimeout(is_alive, 250);
setTimeout(is_alive, 100);
} else {
// if we're ready to go then redirect to new url
@ -78,7 +78,7 @@ $(document).ready(function() {
if (0 == timeoutId) {
timeoutId = setTimeout(is_alive, 250);
timeoutId = setTimeout(is_alive, 100);
}
});