# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1448626884 0
# Node ID 2647dd909229385338982881aa755048ab032943
# Parent  f452455b5977959ea46d007499c767bb02bc6e71# Parent  39f982f9f9f142ff23b0a3ecb7ff9365ec995709
Merge

diff -r f452455b5977 -r 2647dd909229 core.js
--- a/core.js	Fri Nov 27 12:09:49 2015 +0000
+++ b/core.js	Fri Nov 27 12:21:24 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') {