From 1f1a1da21d2f352ec4019484dc72c219ff08242c Mon Sep 17 00:00:00 2001 From: jlukic Date: Sat, 14 Sep 2013 12:34:44 -0400 Subject: [PATCH] Form: fixes issues with ctrl + enter triggering form submit Former-commit-id: f8b1e1da2f0e92e7bef482435b33872e31994122 Former-commit-id: 383b5237801ed513bfe0c57da37f039c020e6c38 --- build/minified/modules/behavior/form.js | 2 +- build/uncompressed/modules/behavior/form.js | 2 +- node/src/documents/index.html.eco | 7 +++---- node/src/files/release/minified/modules/behavior/form.js | 2 +- .../files/release/uncompressed/modules/behavior/form.js | 2 +- node/src/files/stylesheets/semantic.css | 5 +++++ src/modules/behavior/form.js | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build/minified/modules/behavior/form.js b/build/minified/modules/behavior/form.js index 548e795bb..967a8a1b3 100644 --- a/build/minified/modules/behavior/form.js +++ b/build/minified/modules/behavior/form.js @@ -121,7 +121,7 @@ $.fn.form = function(fields, parameters) { .blur() ; } - if( key == keyCode.enter && $field.is(selector.input) ) { + if(!event.ctrlKey && key == keyCode.enter && $field.is(selector.input) ) { module.debug('Enter key pressed, submitting form'); $submit .addClass(className.down) diff --git a/build/uncompressed/modules/behavior/form.js b/build/uncompressed/modules/behavior/form.js index 548e795bb..967a8a1b3 100644 --- a/build/uncompressed/modules/behavior/form.js +++ b/build/uncompressed/modules/behavior/form.js @@ -121,7 +121,7 @@ $.fn.form = function(fields, parameters) { .blur() ; } - if( key == keyCode.enter && $field.is(selector.input) ) { + if(!event.ctrlKey && key == keyCode.enter && $field.is(selector.input) ) { module.debug('Enter key pressed, submitting form'); $submit .addClass(className.down) diff --git a/node/src/documents/index.html.eco b/node/src/documents/index.html.eco index 4fd491bf4..8955e4694 100755 --- a/node/src/documents/index.html.eco +++ b/node/src/documents/index.html.eco @@ -255,9 +255,8 @@ type : 'Semantic'
-