diff options
Diffstat (limited to '')
| -rw-r--r-- | plugins/AdminTools/template/admin_style.css | 1 | ||||
| -rw-r--r-- | plugins/AdminTools/template/mousetrap.min.js | 9 | ||||
| -rw-r--r-- | plugins/AdminTools/template/public_controller.js | 96 | ||||
| -rw-r--r-- | plugins/AdminTools/template/public_controller.tpl | 3 |
4 files changed, 67 insertions, 42 deletions
diff --git a/plugins/AdminTools/template/admin_style.css b/plugins/AdminTools/template/admin_style.css index e15f4aead..76f0cae2c 100644 --- a/plugins/AdminTools/template/admin_style.css +++ b/plugins/AdminTools/template/admin_style.css @@ -7,6 +7,7 @@ .multiview { display:none; + z-index:1000; } #ato_container>ul { diff --git a/plugins/AdminTools/template/mousetrap.min.js b/plugins/AdminTools/template/mousetrap.min.js new file mode 100644 index 000000000..114a22235 --- /dev/null +++ b/plugins/AdminTools/template/mousetrap.min.js @@ -0,0 +1,9 @@ +/* mousetrap v1.4.6 craig.is/killing/mice */ +(function(J,r,f){function s(a,b,d){a.addEventListener?a.addEventListener(b,d,!1):a.attachEvent("on"+b,d)}function A(a){if("keypress"==a.type){var b=String.fromCharCode(a.which);a.shiftKey||(b=b.toLowerCase());return b}return h[a.which]?h[a.which]:B[a.which]?B[a.which]:String.fromCharCode(a.which).toLowerCase()}function t(a){a=a||{};var b=!1,d;for(d in n)a[d]?b=!0:n[d]=0;b||(u=!1)}function C(a,b,d,c,e,v){var g,k,f=[],h=d.type;if(!l[a])return[];"keyup"==h&&w(a)&&(b=[a]);for(g=0;g<l[a].length;++g)if(k= +l[a][g],!(!c&&k.seq&&n[k.seq]!=k.level||h!=k.action||("keypress"!=h||d.metaKey||d.ctrlKey)&&b.sort().join(",")!==k.modifiers.sort().join(","))){var m=c&&k.seq==c&&k.level==v;(!c&&k.combo==e||m)&&l[a].splice(g,1);f.push(k)}return f}function K(a){var b=[];a.shiftKey&&b.push("shift");a.altKey&&b.push("alt");a.ctrlKey&&b.push("ctrl");a.metaKey&&b.push("meta");return b}function x(a,b,d,c){m.stopCallback(b,b.target||b.srcElement,d,c)||!1!==a(b,d)||(b.preventDefault?b.preventDefault():b.returnValue=!1,b.stopPropagation? +b.stopPropagation():b.cancelBubble=!0)}function y(a){"number"!==typeof a.which&&(a.which=a.keyCode);var b=A(a);b&&("keyup"==a.type&&z===b?z=!1:m.handleKey(b,K(a),a))}function w(a){return"shift"==a||"ctrl"==a||"alt"==a||"meta"==a}function L(a,b,d,c){function e(b){return function(){u=b;++n[a];clearTimeout(D);D=setTimeout(t,1E3)}}function v(b){x(d,b,a);"keyup"!==c&&(z=A(b));setTimeout(t,10)}for(var g=n[a]=0;g<b.length;++g){var f=g+1===b.length?v:e(c||E(b[g+1]).action);F(b[g],f,c,a,g)}}function E(a,b){var d, +c,e,f=[];d="+"===a?["+"]:a.split("+");for(e=0;e<d.length;++e)c=d[e],G[c]&&(c=G[c]),b&&"keypress"!=b&&H[c]&&(c=H[c],f.push("shift")),w(c)&&f.push(c);d=c;e=b;if(!e){if(!p){p={};for(var g in h)95<g&&112>g||h.hasOwnProperty(g)&&(p[h[g]]=g)}e=p[d]?"keydown":"keypress"}"keypress"==e&&f.length&&(e="keydown");return{key:c,modifiers:f,action:e}}function F(a,b,d,c,e){q[a+":"+d]=b;a=a.replace(/\s+/g," ");var f=a.split(" ");1<f.length?L(a,f,b,d):(d=E(a,d),l[d.key]=l[d.key]||[],C(d.key,d.modifiers,{type:d.action}, +c,a,e),l[d.key][c?"unshift":"push"]({callback:b,modifiers:d.modifiers,action:d.action,seq:c,level:e,combo:a}))}var h={8:"backspace",9:"tab",13:"enter",16:"shift",17:"ctrl",18:"alt",20:"capslock",27:"esc",32:"space",33:"pageup",34:"pagedown",35:"end",36:"home",37:"left",38:"up",39:"right",40:"down",45:"ins",46:"del",91:"meta",93:"meta",224:"meta"},B={106:"*",107:"+",109:"-",110:".",111:"/",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'"},H={"~":"`","!":"1", +"@":"2","#":"3",$:"4","%":"5","^":"6","&":"7","*":"8","(":"9",")":"0",_:"-","+":"=",":":";",'"':"'","<":",",">":".","?":"/","|":"\\"},G={option:"alt",command:"meta","return":"enter",escape:"esc",mod:/Mac|iPod|iPhone|iPad/.test(navigator.platform)?"meta":"ctrl"},p,l={},q={},n={},D,z=!1,I=!1,u=!1;for(f=1;20>f;++f)h[111+f]="f"+f;for(f=0;9>=f;++f)h[f+96]=f;s(r,"keypress",y);s(r,"keydown",y);s(r,"keyup",y);var m={bind:function(a,b,d){a=a instanceof Array?a:[a];for(var c=0;c<a.length;++c)F(a[c],b,d);return this}, +unbind:function(a,b){return m.bind(a,function(){},b)},trigger:function(a,b){if(q[a+":"+b])q[a+":"+b]({},a);return this},reset:function(){l={};q={};return this},stopCallback:function(a,b){return-1<(" "+b.className+" ").indexOf(" mousetrap ")?!1:"INPUT"==b.tagName||"SELECT"==b.tagName||"TEXTAREA"==b.tagName||b.isContentEditable},handleKey:function(a,b,d){var c=C(a,b,d),e;b={};var f=0,g=!1;for(e=0;e<c.length;++e)c[e].seq&&(f=Math.max(f,c[e].level));for(e=0;e<c.length;++e)c[e].seq?c[e].level==f&&(g=!0, +b[c[e].seq]=1,x(c[e].callback,d,c[e].combo,c[e].seq)):g||x(c[e].callback,d,c[e].combo);c="keypress"==d.type&&I;d.type!=u||w(a)||c||t(b);I=g&&"keydown"==d.type}};J.Mousetrap=m;"function"===typeof define&&define.amd&&define(m)})(window,document); diff --git a/plugins/AdminTools/template/public_controller.js b/plugins/AdminTools/template/public_controller.js index 142cded3b..7a61b5c9c 100644 --- a/plugins/AdminTools/template/public_controller.js +++ b/plugins/AdminTools/template/public_controller.js @@ -241,7 +241,7 @@ var AdminTools = function($) { // try to find background color matching text color // there is a 1s delay to wait for jQuery Mobile initialization - setTimeout(function() { + function bgColor() { var bg_color = 'white'; var selectors = ['#the_page #content', '[data-role="page"]', 'body']; @@ -254,19 +254,13 @@ var AdminTools = function($) { } $ato_edit.css('background-color', bg_color); - }, 1000); + } $ato_edit.find('.close-edit').on('click', function(e) { $.colorbox.close() e.preventDefault(); }); - if (is_picture) { - $ato_edit.find('.datepicker').datepicker({ - dateFormat: 'yy-mm-dd' - }); - } - $(".edit-quick").colorbox({ inline: true, transition: 'none', @@ -275,44 +269,62 @@ var AdminTools = function($) { top: 50, title: $ato_edit.attr('title'), - onOpen: function() { - if (!is_picture) return; - - // fetch tags list on first open - if ($(this).data('tags-init')) return; + onComplete: function() { + setTimeout(function() { + $('#quick_edit_name').focus(); + }, 0); + }, - $.ajax({ - method: 'POST', - url: __this.urlWS + 'pwg.tags.getList', - dataType: 'json', - success: function(data) { - var tags = []; - // convert to custom format - for (var i=0, l=data.result.tags.length; i<l; i++) { - tags.push({ - id: '~~'+ data.result.tags[i].id +'~~', - name: data.result.tags[i].name - }); + onOpen: function() { + bgColor(); + + if (is_picture) { + $ato_edit.find('.datepicker').datepicker({ + dateFormat: 'yy-mm-dd' + }); + + // fetch tags list on first open + if ($(this).data('tags-init')) return; + + $.ajax({ + method: 'POST', + url: __this.urlWS + 'pwg.tags.getList', + dataType: 'json', + success: function(data) { + var tags = []; + // convert to custom format + for (var i=0, l=data.result.tags.length; i<l; i++) { + tags.push({ + id: '~~'+ data.result.tags[i].id +'~~', + name: data.result.tags[i].name + }); + } + + $ato_edit.find('.tags').tokenInput( + tags, + $.extend({ + animateDropdown: false, + preventDuplicates: true, + allowFreeTagging: true + }, tokeninput_lang) + ); + + $.colorbox.resize(); + $(this).data('tags-init', true); + }, + error: function(xhr, text, error) { + alert(text + ' ' + error); } - - $ato_edit.find('.tags').tokenInput( - tags, - $.extend({ - animateDropdown: false, - preventDuplicates: true, - allowFreeTagging: true - }, tokeninput_lang) - ); - - $.colorbox.resize(); - $(this).data('tags-init', true); - }, - error: function(xhr, text, error) { - alert(text + ' ' + error); - } - }); + }); + } } }); + + // Ctrl+E opens the quick edit + Mousetrap.bind('mod+e', function(e) { + e.preventDefault(); + $(".edit-quick").click(); + }); }; return this; diff --git a/plugins/AdminTools/template/public_controller.tpl b/plugins/AdminTools/template/public_controller.tpl index f234880df..2b74476ce 100644 --- a/plugins/AdminTools/template/public_controller.tpl +++ b/plugins/AdminTools/template/public_controller.tpl @@ -4,6 +4,9 @@ {combine_css path=$ADMINTOOLS_PATH|cat:'template/fontello/css/fontello-ato.css'} {if isset($ato.QUICK_EDIT)} + {*<!-- mousetrap -->*} + {combine_script id='mousetrap' load='footer' path=$ADMINTOOLS_PATH|cat:'template/mousetrap.min.js'} + {*<!-- colorbox -->*} {combine_script id='jquery.colorbox' load='footer' require='jquery' path='themes/default/js/plugins/jquery.colorbox.min.js'} {combine_css id='colorbox' path='themes/default/js/plugins/colorbox/style2/colorbox.css'} |