first fix for sql query autofocus and submitting the query with ctrl-…

…enter
phpmyadmin · Jan 8, 2013 · a67c90a · a67c90a
1 parent a2908fe
commit a67c90a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/js/functions.js b/js/functions.js
@@ -1423,12 +1423,6 @@ AJAX.registerOnload('functions.js', function() {
         }
     });
 
-    $('#sqlquery').focus().keydown(function (e) {
-        if (e.ctrlKey && e.keyCode == 13) {
-            $("#sqlqueryform").submit();
-        }
-    });
-
     if ($('#input_username')) {
         if ($('#input_username').val() == '') {
             $('#input_username').focus();
@@ -3385,8 +3379,15 @@ AJAX.registerOnload('functions.js', function() {
             matchBrackets: true,
             indentUnit: 4,
             mode: "text/x-mysql",
-            lineWrapping: true
+            lineWrapping: true,
+            onKeyEvent: function (inst, e) {
+                if (e.type == 'keydown' && e.ctrlKey && (e.keyCode == 13 || e.keyCode == 10)) {
+                    $("#button_submit_query").submit();
+                    return false;
+                }
+            }
         });
+        codemirror_editor.focus();
     }
 });
 AJAX.registerTeardown('functions.js', function() {