Merge pull request #896 from JackDandy/feature/UpdateJQuery

Update jQuery 1.8.3 to 2.2.4.
This commit is contained in:
JackDandy 2017-02-02 01:07:59 +00:00 committed by GitHub
commit 45c9ca7884
14 changed files with 22 additions and 19 deletions

View file

@ -40,6 +40,7 @@
* Update jQuery UI Touch Punch 0.2.2 to 0.2.3
* Update qTip 2.2.1 to 2.2.2
* Update tablesorter 2.17.7 to 2.28.5
* Update jQuery 1.8.3 to 2.2.4
[develop changelog]

View file

@ -96,7 +96,7 @@
#raw
jQuery('#episodeDir').fileBrowser({title:'Select Unprocessed Episode Folder', key:'postprocessPath'});
$('#process_method').change(function(){
$('#move-and-trash').css({'display':('move' == $(this).attr('value') ? 'block' : 'none')})
$('#move-and-trash').css({'display':('move' == $(this).val() ? 'block' : 'none')})
});
#end raw
//-->

View file

@ -49,12 +49,12 @@
<link rel="stylesheet" type="text/css" href="$sbRoot/css/style.css?v=$sbPID"/>
<link rel="stylesheet" type="text/css" href="$sbRoot/css/${sg_str('THEME_NAME', 'dark')}.css?v=$sbPID" />
<script type="text/javascript" src="$sbRoot/js/lib/jquery-1.8.3.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-2.2.4.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/bootstrap.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/bootstrap-hover-dropdown.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery-ui.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.json.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookie.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/js.cookie.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.cookiejar.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.selectboxes.min.js?v=$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/lib/jquery.tablesorter.combined.min.js?v=$sbPID"></script>

View file

@ -19,12 +19,12 @@ $('#remove-white, #remove-black').click(function() {
});
$('#new-white, #new-black').click(function() {
var group = $('#addToPoolText').attr('value');
var group = $('#addToPoolText').val();
if ('' != group) {
var option = $('<option>');
option.attr('value', group);
option.val(group);
option.html(group);
option.appendTo('#' + $(this).attr('id').replace(/new[-]/i, ''));
$('#addToPoolText').attr('value', '');
$('#addToPoolText').val('');
}
});

View file

@ -315,14 +315,14 @@ function fetch_branches() {
function add_option_to_pulls(text) {
var option = $('<option>');
option.attr('value', text[1]);
option.val(text[1]);
option.html(text[0]);
option.appendTo('#pullRequestVersion');
}
function add_option_to_branches(text) {
var option = $('<option>');
option.attr('value', text);
option.val(text);
option.html(text);
option.appendTo('#branchVersion');
}

View file

@ -545,7 +545,7 @@ $(document).ready(function(){
$.each(options, function(index, option){
$option = $('<option></option>')
.attr('value', option.value)
.val(option.value)
.text(option.text);
self.append($option);
});

View file

@ -48,7 +48,7 @@ $(document).ready(function(){
$(this).showHideServices();
});
$('.service_enabler').live('click', function(){
$('.service_enabler').on('click', function(){
$(this).refreshServiceList();
});

View file

@ -9,7 +9,7 @@ $(document).ready(function() {
// handle the show selection dropbox
$('#pickShow').change(function() {
var val = $(this).attr('value');
var val = $(this).val();
if (val != 0)
window.location.href = $.SickGear.Root + '/home/displayShow?show=' + val;
});
@ -56,8 +56,8 @@ $(document).ready(function() {
this.checked && epArr.push($(this).attr('id'))
});
if (epArr.length)
window.location.href = $.SickGear.Root + '/home/setStatus?show=' + $('#showID').attr('value') +
'&eps=' + epArr.join('|') + '&status=' + $('#statusSelect').attr('value');
window.location.href = $.SickGear.Root + '/home/setStatus?show=' + $('#showID').val() +
'&eps=' + epArr.join('|') + '&status=' + $('#statusSelect').val();
});
// show/hide different types of rows when the checkboxes are changed

View file

@ -67,7 +67,7 @@ $(document).ready(function () {
$('#SceneException').fadeIn('fast', 'linear');
var option = $('<option>');
option.attr('value', sceneExSeason + '|' + sceneEx);
option.val(sceneExSeason + '|' + sceneEx);
option.html((config.showIsAnime ? 'S' + ('-1' === sceneExSeason ? '*' : sceneExSeason) + ': ' : '') + sceneEx);
return option.appendTo($('#exceptions_list'));

File diff suppressed because one or more lines are too long

4
gui/slick/js/lib/jquery-2.2.4.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View file

@ -309,7 +309,7 @@ $(document).ready(function () {
groupvalue = match[1];
groupview = groupvalue + match[2];
}
option.attr('value', groupvalue);
option.val(groupvalue);
option.html(groupview);
option.appendTo('#pool');
}

View file

@ -62,7 +62,7 @@ function resetFilters(text) {
}
function preventDefault() {
$("a[href='#']").live('click', function () {
$("a[href='#']").on('click', function () {
return false;
});
}

View file

@ -38,7 +38,7 @@ $(document).ready(function(){
if (epArr.length == 0)
return false
url = sbRoot+'/home/doRename?show='+$('#showID').attr('value')+'&eps='+epArr.join('|')
url = sbRoot+'/home/doRename?show='+$('#showID').val()+'&eps='+epArr.join('|')
window.location.href = url
});