github-mirrors/bazarr
1
0
Fork 0
mirror of https://github.com/morpheus65535/bazarr.git synced 2025-04-24 06:37:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Conflict removal

Browse source
This commit is contained in:
Louis Vézina 2017-10-27 12:04:46 -04:00
parent f9af5d3f26
commit 9eeae32e1c
1 changed files with 0 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

33
views/series.tpl
View file

@ -190,16 +190,7 @@
$('table').tablesort();
<<<<<<< HEAD
<<<<<<< HEAD
$('a, button:not(.cancel)').bind('click touchend', function(e){
e.preventDefault();
=======
$('a, button:not(.cancel)').on('click touch', function(){
>>>>>>> parent of 5ad908b... Add JQM for compatibility with touch
=======
$('a, button:not(.cancel)').click(function(){
>>>>>>> parent of 7368f13... Add support for javascript mobile touch instead of click event
$('#loader').addClass('active');
})
@ -209,26 +200,7 @@
})
;
<<<<<<< HEAD
<<<<<<< HEAD
$('#update_series').bind('click touchend', function(){
window.location = '{{base_url}}/update_series';
})
$('#update_all_episodes').bind('click touchend', function(){
window.location = '{{base_url}}/update_all_episodes';
})
$('#add_new_episodes').bind('click touchend', function(){
window.location = '{{base_url}}/add_new_episodes';
})
$('.config').bind('click touchend', function(){
=======
$('#update_series').on('click touch', function(){
=======
$('#update_series').click(function(){
>>>>>>> parent of 7368f13... Add support for javascript mobile touch instead of click event
window.location = '{{base_url}}/update_series';
})
@ -240,12 +212,7 @@
window.location = '{{base_url}}/add_new_episodes';
})
<<<<<<< HEAD
$('.config').on('click touch', function(){
>>>>>>> parent of 5ad908b... Add JQM for compatibility with touch
=======
$('.config').click(function(){
>>>>>>> parent of 7368f13... Add support for javascript mobile touch instead of click event
sessionStorage.scrolly=$(window).scrollTop();
$('#series_form').attr('action', '{{base_url}}/edit_series/' + $(this).data("tvdbid"));