Revert change

views/episodes.tpl

@@ -200,15 +200,15 @@
 </html>
 
 <script>
-	$('#scan_disk').on('click touch', function(){
+	$('#scan_disk').click(function(){
 		window.location = '{{base_url}}/scan_disk/{{no}}';
 	})
 
-	$('#search_missing_subtitles').on('click touch', function(){
+	$('#search_missing_subtitles').click(function(){
 		window.location = '{{base_url}}/search_missing_subtitles/{{no}}';
 	})
 
-	$('.remove_subtitles').on('click touch', function(){
+	$('.remove_subtitles').click(function(){
 		    var values = {
 		            episodePath: $(this).attr("data-episodePath"),
 		            language: $(this).attr("data-language"),
@@ -225,7 +225,7 @@
 		    $('#loader').addClass('active');
 	})
 
-	$('.get_subtitle').on('click touch', function(){
+	$('.get_subtitle').click(function(){
 		    var values = {
 		            episodePath: $(this).attr("data-episodePath"),
 		            language: $(this).attr("data-language"),

views/history.tpl

@@ -158,22 +158,22 @@
 	    sessionStorage.clear();
 	}
 
-	$('a, i').on('click touch', function(){
+	$('a, i').click(function(){
 		sessionStorage.scrolly=$(window).scrollTop();
 
 		$('#loader').addClass('active');
 	})
 
-	$('.backward').on('click touch', function(){
+	$('.backward').click(function(){
 		location.href="?page={{int(page)-1}}";
 	})
-	$('.fast.backward').on('click touch', function(){
+	$('.fast.backward').click(function(){
 		location.href="?page=1";
 	})
-	$('.forward').on('click touch', function(){
+	$('.forward').click(function(){
 		location.href="?page={{int(page)+1}}";
 	})
-	$('.fast.forward').on('click touch', function(){
+	$('.fast.forward').click(function(){
 		location.href="?page={{int(max_page)}}";
 	})
 </script>

views/series.tpl

@@ -190,12 +190,16 @@
 
 	$('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');
 	})
 
@@ -205,6 +209,7 @@
 		})
 	;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	$('#update_series').bind('click touchend', function(){
 		window.location = '{{base_url}}/update_series';
@@ -221,19 +226,26 @@
 	$('.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';
 	})
 
-	$('#update_all_episodes').on('click touch', function(){
+	$('#update_all_episodes').click(function(){
 		window.location = '{{base_url}}/update_all_episodes';
 	})
 
-	$('#add_new_episodes').on('click touch', function(){
+	$('#add_new_episodes').click(function(){
 		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"));

views/settings.tpl

@@ -332,7 +332,7 @@
 		.tab()
 	;
 
-	$('a.menu').on('click touch', function(){
+	$('a.menu').click(function(){
 		$('#loader').addClass('active');
 	})
 

views/system.tpl

@@ -173,13 +173,13 @@ icon"></i></td>
 		.tab()
 	;
 
-	$('.log').on('click touch', function(){
+	$('.log').click(function(){
 		$("#message").html($(this).data("message"));
 		$("#exception").html($(this).data("exception"));
 		$('.small.modal').modal('show');
 	})
 
-	$('a.menu').on('click touch', function(){
+	$('a.menu').click(function(){
 		$('#loader').addClass('active');
 	})
 </script>

views/wanted.tpl

@@ -153,28 +153,28 @@
 
 
 <script>
-	$('a, button').on('click touch', function(){
+	$('a, button').click(function(){
 		$('#loader').addClass('active');
 	})
 
-	$('.fast.backward').on('click touch', function(){
+	$('.fast.backward').click(function(){
 		location.href="?page=1";
 	})
-	$('.backward').on('click touch', function(){
+	$('.backward').click(function(){
 		location.href="?page={{int(page)-1}}";
 	})
-	$('.forward').on('click touch', function(){
+	$('.forward').click(function(){
 		location.href="?page={{int(page)+1}}";
 	})
-	$('.fast.forward').on('click touch', function(){
+	$('.fast.forward').click(function(){
 		location.href="?page={{int(max_page)}}";
 	})
 
-	$('#wanted_search_missing_subtitles').on('click touch', function(){
+	$('#wanted_search_missing_subtitles').click(function(){
 		window.location = '{{base_url}}/wanted_search_missing_subtitles';
 	})
 
-	$('.get_subtitle').on('click touch', function(){
+	$('.get_subtitle').click(function(){
 		    var values = {
 		            episodePath: $(this).attr("data-episodePath"),
 		            language: $(this).attr("data-language"),