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

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() {
      ========================================================================== */
 
   $(window).keydown(function(e){
-    switch (e.keyCode) {
-      // s letter
-      case 83:
-        $bagitForm.toggle();
-      break;
-      case 27:
-        $bagitForm.hide();
-      break;
+    if ( e.target.tagName.toLowerCase() !== 'input' ) {
+      switch (e.keyCode) {
+        // s letter
+        case 83:
+          $bagitForm.toggle();
+          return false;
+        break;
+        case 27:
+          $bagitForm.hide();
+        break;
+      }
     }
   })
 
 
-});
\ No newline at end of file
+});