浏览代码

history repeats itself

Simon Van Mierlo 9 年之前
父节点
当前提交
406543f229
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 3 3
      client/gui_utils.js
  2. 3 0
      client/styles.css

+ 3 - 3
client/gui_utils.js

@@ -515,8 +515,8 @@ GUIUtils = function(){
 				
 				return true;
 			}
-			/*rolled back behaviour by popular demand (Eugene) - Vasco 4-2-17 */
-			else if( event.keyCode == KEY_ENTER /* ENTER */ && currentKeys[ KEY_SHIFT ] == 1)
+            // https://media.giphy.com/media/12XMGIWtrHBl5e/giphy.gif
+			else if( event.keyCode == KEY_ENTER )
 			{
                 if (rows > 1) {
                     // only for multi-line input fields
@@ -532,7 +532,7 @@ GUIUtils = function(){
 			}
 		});
         input.keyup( function (event) {
-			if( event.keyCode == KEY_ENTER /* ENTER */ && currentKeys[ KEY_SHIFT ] == 1)
+			if( event.keyCode == KEY_ENTER )
 			{
 				event.stopPropagation();
                 event.preventDefault();

+ 3 - 0
client/styles.css

@@ -8,6 +8,9 @@ input, textarea {
 textarea.string_input {
     resize: none;
 }
+textarea.string_input {
+    resize: none;
+}
 select, option, button {
 	cursor:pointer;
 }