aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes/baggy
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-03-12 12:55:48 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-03-12 12:55:48 +0100
commitf7382cd8c3141c2d1a7dd4fc129cb4b53992d95c (patch)
tree422a2365f2e0d0d2361aa0e01ee4e487c0a985e0 /themes/baggy
parent1acd18510a8fc5b843bf793322ed79b249b195dc (diff)
parent7339b0b08dc5cd97c478981a431829bf587256f2 (diff)
downloadwallabag-f7382cd8c3141c2d1a7dd4fc129cb4b53992d95c.tar.gz
wallabag-f7382cd8c3141c2d1a7dd4fc129cb4b53992d95c.tar.zst
wallabag-f7382cd8c3141c2d1a7dd4fc129cb4b53992d95c.zip
Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict
fix of conflict of s shortcat and entering s in input fields
Diffstat (limited to 'themes/baggy')
-rwxr-xr-xthemes/baggy/js/init.js21
1 files changed, 12 insertions, 9 deletions
diff --git a/themes/baggy/js/init.js b/themes/baggy/js/init.js
index 99bffd09..4e85beaa 100755
--- a/themes/baggy/js/init.js
+++ b/themes/baggy/js/init.js
@@ -60,16 +60,19 @@ $.fn.ready(function() {
60 ========================================================================== */ 60 ========================================================================== */
61 61
62 $(window).keydown(function(e){ 62 $(window).keydown(function(e){
63 switch (e.keyCode) { 63 if ( e.target.tagName.toLowerCase() !== 'input' ) {
64 // s letter 64 switch (e.keyCode) {
65 case 83: 65 // s letter
66 $bagitForm.toggle(); 66 case 83:
67 break; 67 $bagitForm.toggle();
68 case 27: 68 return false;
69 $bagitForm.hide(); 69 break;
70 break; 70 case 27:
71 $bagitForm.hide();
72 break;
73 }
71 } 74 }
72 }) 75 })
73 76
74 77
75}); \ No newline at end of file 78});