Merge pull request #179 from jacksonchen/issue_149

Solves Issue 149
biocore · Aug 29, 2013 · c841fa8 · c841fa8
2 parents 9166061 + 986c543
commit c841fa8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/emperor/format.py b/emperor/format.py
@@ -538,7 +538,7 @@ def format_emperor_html_footer_string(has_biplots=False, has_ellipses=False,
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>

diff --git a/emperor/support_files/emperor/js/emperor.js b/emperor/support_files/emperor/js/emperor.js
@@ -2002,6 +2002,13 @@ $(document).ready(function() {
         if (g_validAsciiCodes.indexOf(code)==-1)
             event.preventDefault();
     });
+
+    // Disables the enter key in the search bar
+    $('#searchBox').keypress(function(event) {
+    	if (event.keyCode == 13) {
+        	event.preventDefault();
+    	}
+	});
 
 	init();
 	animate();
@@ -2277,5 +2284,4 @@ $(document).ready(function() {
 		g_mainRenderer.render( g_mainScene, g_sceneCamera);
 	}
 
-
-});
+});
diff --git a/tests/test_format.py b/tests/test_format.py
@@ -493,7 +493,7 @@ def test_format_emperor_html_footer_string(self):
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>
@@ -656,7 +656,7 @@ def test_format_emperor_html_footer_string(self):
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>
@@ -830,7 +830,7 @@ def test_format_emperor_html_footer_string(self):
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>
@@ -988,7 +988,7 @@ def test_format_emperor_html_footer_string(self):
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>
@@ -1150,7 +1150,7 @@ def test_format_emperor_html_footer_string(self):
         </ul>
         <div id="keytab">
             <form name="keyFilter">
-            <label>Filter  </label><input name="filterBox" type="text" onkeyup="filterKey()"></input>
+            <label>Filter  </label><input name="filterBox" id="searchBox" type="text" onkeyup="filterKey()"></input>
             </form>
             <div id="key">
             </div>