Mercurial > hg > webaudioevaluationtool

changeset 1470:b2a2a39f3e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Enter key press will always trigger 'next' in any popup survey
author Nicholas Jillings <nickjillings@users.noreply.github.com>
date Fri, 27 Nov 2015 12:20:56 +0000
parents 006ecc7f906c
children 20268b33cfaa
files core.js
diffstat 1 files changed, 1 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/core.js	Fri Nov 27 11:08:45 2015 +0000
+++ b/core.js	Fri Nov 27 12:20:56 2015 +0000
@@ -139,13 +139,6 @@
 		$(window).keypress(function(e){
 			if (e.keyCode == 13 && popup.popup.style.visibility == 'visible')
 			{
-				// Enter key pressed
-				var textarea = $(popup.popupContent).find('textarea');
-				if (textarea.length != 0)
-				{
-					if (textarea[0] == document.activeElement)
-					{return;}
-				}
 				popup.buttonProceed.onclick();
 			}
 		});
@@ -158,6 +151,7 @@
 		blank.style.zIndex = -2;
 		blank.style.visibility = 'hidden';
 		this.buttonPrevious.style.visibility = 'inherit';
+		$(window).keypress(function(e){});
 	};
 	
 	this.postNode = function() {
@@ -190,12 +184,6 @@
 				textArea.rows = "10";
 				break;
 			}
-			document.onkeydown=function(){
-				if(window.event.keyCode=='13'){ // when you hit enter
-					window.event.preventDefault(); // don't make newline
-					popup.proceedClicked(); // go to the next window (or start the test or submit)
-				}
-			}
 			this.popupResponse.appendChild(textArea);
 			textArea.focus();
 		} else if (node.type == 'checkbox') {