open-source-mirrors
/
bazarr
mirror of https://github.com/morpheus65535/bazarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert change

Browse Source
pull/26/head
Louis Vézina 7 years ago
parent fa7b933264
commit 18cf3b65b8
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File

3
static/jquery/jquery.mobile.vmouse.min.js vendored
Unescape View File

@ -1,3 +0,0 @@
/*! jQuery Mobile v1.4.5 | Copyright 2010, 2014 jQuery Foundation, Inc. | jquery.org/license */
(function(e,t,n){typeof define=="function"&&define.amd?define(["jquery"],function(r){return n(r,e,t),r.mobile}):n(e.jQuery,e,t)})(this,document,function(e,t,n,r){(function(e,t,n,r){function T(e){while(e&&typeof e.originalEvent!="undefined")e=e.originalEvent;return e}function N(t,n){var i=t.type,s,o,a,l,c,h,p,d,v;t=e.Event(t),t.type=n,s=t.originalEvent,o=e.event.props,i.search(/^(mouse|click)/)>-1&&(o=f);if(s)for(p=o.length,l;p;)l=o[--p],t[l]=s[l];i.search(/mouse(down|up)|click/)>-1&&!t.which&&(t.which=1);if(i.search(/^touch/)!==-1){a=T(s),i=a.touches,c=a.changedTouches,h=i&&i.length?i[0]:c&&c.length?c[0]:r;if(h)for(d=0,v=u.length;d<v;d++)l=u[d],t[l]=h[l]}return t}function C(t){var n={},r,s;while(t){r=e.data(t,i);for(s in r)r[s]&&(n[s]=n.hasVirtualBinding=!0);t=t.parentNode}return n}function k(t,n){var r;while(t){r=e.data(t,i);if(r&&(!n||r[n]))return t;t=t.parentNode}return null}function L(){g=!1}function A(){g=!0}function O(){E=0,v.length=0,m=!1,A()}function M(){L()}function _(){D(),c=setTimeout(function(){c=0,O()},e.vmouse.resetTimerDuration)}function D(){c&&(clearTimeout(c),c=0)}function P(t,n,r){var i;if(r&&r[t]||!r&&k(n.target,t))i=N(n,t),e(n.target).trigger(i);return i}function H(t){var n=e.data(t.target,s),r;!m&&(!E||E!==n)&&(r=P("v"+t.type,t),r&&(r.isDefaultPrevented()&&t.preventDefault(),r.isPropagationStopped()&&t.stopPropagation(),r.isImmediatePropagationStopped()&&t.stopImmediatePropagation()))}function B(t){var n=T(t).touches,r,i,o;n&&n.length===1&&(r=t.target,i=C(r),i.hasVirtualBinding&&(E=w++,e.data(r,s,E),D(),M(),d=!1,o=T(t).touches[0],h=o.pageX,p=o.pageY,P("vmouseover",t,i),P("vmousedown",t,i)))}function j(e){if(g)return;d||P("vmousecancel",e,C(e.target)),d=!0,_()}function F(t){if(g)return;var n=T(t).touches[0],r=d,i=e.vmouse.moveDistanceThreshold,s=C(t.target);d=d||Math.abs(n.pageX-h)>i||Math.abs(n.pageY-p)>i,d&&!r&&P("vmousecancel",t,s),P("vmousemove",t,s),_()}function I(e){if(g)return;A();var t=C(e.target),n,r;P("vmouseup",e,t),d||(n=P("vclick",e,t),n&&n.isDefaultPrevented()&&(r=T(e).changedTouches[0],v.push({touchID:E,x:r.clientX,y:r.clientY}),m=!0)),P("vmouseout",e,t),d=!1,_()}function q(t){var n=e.data(t,i),r;if(n)for(r in n)if(n[r])return!0;return!1}function R(){}function U(t){var n=t.substr(1);return{setup:function(){q(this)||e.data(this,i,{});var r=e.data(this,i);r[t]=!0,l[t]=(l[t]||0)+1,l[t]===1&&b.bind(n,H),e(this).bind(n,R),y&&(l.touchstart=(l.touchstart||0)+1,l.touchstart===1&&b.bind("touchstart",B).bind("touchend",I).bind("touchmove",F).bind("scroll",j))},teardown:function(){--l[t],l[t]||b.unbind(n,H),y&&(--l.touchstart,l.touchstart||b.unbind("touchstart",B).unbind("touchmove",F).unbind("touchend",I).unbind("scroll",j));var r=e(this),s=e.data(this,i);s&&(s[t]=!1),r.unbind(n,R),q(this)||r.removeData(i)}}}var i="virtualMouseBindings",s="virtualTouchID",o="vmouseover vmousedown vmousemove vmouseup vclick vmouseout vmousecancel".split(" "),u="clientX clientY pageX pageY screenX screenY".split(" "),a=e.event.mouseHooks?e.event.mouseHooks.props:[],f=e.event.props.concat(a),l={},c=0,h=0,p=0,d=!1,v=[],m=!1,g=!1,y="addEventListener"in n,b=e(n),w=1,E=0,S,x;e.vmouse={moveDistanceThreshold:10,clickDistanceThreshold:10,resetTimerDuration:1500};for(x=0;x<o.length;x++)e.event.special[o[x]]=U(o[x]);y&&n.addEventListener("click",function(t){var n=v.length,r=t.target,i,o,u,a,f,l;if(n){i=t.clientX,o=t.clientY,S=e.vmouse.clickDistanceThreshold,u=r;while(u){for(a=0;a<n;a++){f=v[a],l=0;if(u===r&&Math.abs(f.x-i)<S&&Math.abs(f.y-o)<S||e.data(u,s)===f.touchID){t.preventDefault(),t.stopPropagation();return}}u=u.parentNode}}},!0)})(e,t,n)});

21
views/series.tpl
Unescape View File

@ -2,7 +2,6 @@
<head> <head>
<!DOCTYPE html> <!DOCTYPE html>
<script src="{{base_url}}/static/jquery/jquery-latest.min.js"></script> <script src="{{base_url}}/static/jquery/jquery-latest.min.js"></script>
<script src="{{base_url}}/static/jquery/jquery.mobile.vmouse.min.js"></script>
<script src="{{base_url}}/static/semantic/semantic.min.js"></script> <script src="{{base_url}}/static/semantic/semantic.min.js"></script>
<script src="{{base_url}}/static/jquery/tablesort.js"></script> <script src="{{base_url}}/static/jquery/tablesort.js"></script>
<link rel="stylesheet" href="{{base_url}}/static/semantic/semantic.min.css"> <link rel="stylesheet" href="{{base_url}}/static/semantic/semantic.min.css">
@ -191,8 +190,12 @@
$('table').tablesort(); $('table').tablesort();
<<<<<<< HEAD
$('a, button:not(.cancel)').bind('click touchend', function(e){ $('a, button:not(.cancel)').bind('click touchend', function(e){
e.preventDefault(); e.preventDefault();
=======
$('a, button:not(.cancel)').on('click touch', function(){
>>>>>>> parent of 5ad908b... Add JQM for compatibility with touch
$('#loader').addClass('active'); $('#loader').addClass('active');
}) })
@ -202,6 +205,7 @@
}) })
; ;
<<<<<<< HEAD
$('#update_series').bind('click touchend', function(){ $('#update_series').bind('click touchend', function(){
window.location = '{{base_url}}/update_series'; window.location = '{{base_url}}/update_series';
}) })
@ -215,6 +219,21 @@
}) })
$('.config').bind('click touchend', function(){ $('.config').bind('click touchend', function(){
=======
$('#update_series').on('click touch', function(){
window.location = '{{base_url}}/update_series';
})
$('#update_all_episodes').on('click touch', function(){
window.location = '{{base_url}}/update_all_episodes';
})
$('#add_new_episodes').on('click touch', function(){
window.location = '{{base_url}}/add_new_episodes';
})
$('.config').on('click touch', function(){
>>>>>>> parent of 5ad908b... Add JQM for compatibility with touch
sessionStorage.scrolly=$(window).scrollTop(); sessionStorage.scrolly=$(window).scrollTop();
$('#series_form').attr('action', '{{base_url}}/edit_series/' + $(this).data("tvdbid")); $('#series_form').attr('action', '{{base_url}}/edit_series/' + $(this).data("tvdbid"));

Write Preview
Loading…
Cancel
Save