mirror
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
morpheus65535 2018-03-13 06:21:41 -04:00
parent 6ea3f81338 958eacad8e
commit 22b86cb083
3 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bazarr.py
View File

@ -1,4 +1,4 @@
bazarr_version = '0.3.5'
bazarr_version = '0.3.6'
import os
import sys

24
views/episodes.tpl
View File

@ -70,10 +70,6 @@
var first_season_acc_content = document.getElementsByClassName("content")[0];
first_season_acc_content.className += " active";
});
$(window).on('beforeunload',function(){
$('#loader').addClass('active');
});
</script>
</head>
<body>
@ -288,7 +284,12 @@
dataType: "json",
data: values
});
$('#loader').addClass('active');
$(document).ajaxStart(function(){
$('#loader').addClass('active');
});
$(document).ajaxStop(function(){
window.location.reload();
});
})
$('.get_subtitle').click(function(){
@ -307,12 +308,17 @@
dataType: "json",
data: values
});
$('#loader').addClass('active');
$(document).ajaxStart(function(){
$('#loader').addClass('active');
});
$(document).ajaxStop(function(){
window.location.reload();
});
})
$(document).ajaxStop(function(){
window.location.reload();
});
$('a, i').click(function(){
$('#loader').addClass('active');
})
$('.modal')
.modal({

11
views/settings.tpl
View File

@ -282,7 +282,7 @@
<div class="ui grid">
<div class="middle aligned row">
<div class="right aligned four wide column">
<label>Listening IP address</label>
<label>Hostname or IP address</label>
</div>
<div class="five wide column">
<div class='field'>
@ -292,7 +292,7 @@
</div>
</div>
<div class="collapsed center aligned column">
<div class="ui basic icon" data-tooltip="IP4 address of Sonarr" data-inverted="">
<div class="ui basic icon" data-tooltip="Hostname or IP4 address of Sonarr" data-inverted="">
<i class="help circle large icon"></i>
</div>
</div>
@ -638,7 +638,7 @@
settings_general_ip : ['regExp[/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/]', 'empty'],
settings_general_port : ['integer[1..65535]', 'empty'],
settings_sonarr_ip : ['regExp[/^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/]', 'empty'],
settings_sonarr_ip : ['empty'],
settings_sonarr_port : ['integer[1..65535]', 'empty'],
settings_sonarr_apikey : ['exactLength[32]', 'empty'],
@ -679,4 +679,9 @@
$('.form').form('validate form');
$('#loader').removeClass('active');
});
$('#settings_form').focusout(function() {
$('.form').form('validate form');
$('#loader').removeClass('active');
})
</script>