Merge pull request #1887 from emergie/bugfix_#1810_Keyboard_shortcuts_are_active_when_typing_into_search_box

bugfix: #1810 Keyboard shortcuts are active when typing into search b…

Author: tarzanek

web/js/diff-0.0.2.js

@@ -17,6 +17,8 @@
  * CDDL HEADER END
  */
 
+/* global textInputHasFocus */
+
 /*
  * Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved.
  */
@@ -124,6 +126,9 @@
                 load: function ($window) {
                     var that = this
                     $(document).keypress(function (e) {
+                        if (textInputHasFocus()) {
+                            return true;
+                        }
                         var key = e.keyCode || e.which
                         switch (key) {
                             case 110: // n

web/js/utils-0.0.18.js

@@ -846,6 +846,9 @@
                 load: function ($window) {
                     var that = this;
                     $(document).keypress(function (e) {
+                        if (textInputHasFocus()) {
+                            return true;
+                        }
                         var key = e.which;
                         switch (key) {
                             case 49: // 1
@@ -1953,13 +1956,14 @@ function isOnSearchPage() {
  */
 function searchSubmit(form) {
     var submitInitiator = '';
-    if (document.activeElement && document.activeElement.nodeName === 'INPUT') {
+    if (textInputHasFocus()) {
         submitInitiator = document.activeElement.getAttribute('id');
     }
     if (submitInitiator) {
         var input = document.createElement('INPUT');
         input.setAttribute('name', 'si');
         input.value = submitInitiator;
+        input.type = 'hidden';
         form.appendChild(input);
     }
 }
@@ -1980,3 +1984,12 @@ function restoreFocusAfterSearchSubmit() {
         }
     }
 }
+
+/**
+ * @return {boolean} true if focus is on a input[type=text] element
+ */
+function textInputHasFocus() {
+    return !!document.activeElement &&
+        document.activeElement.nodeName === 'INPUT' &&
+        document.activeElement.type === 'text';
+}