fixes bug 638223 - Delete confirmation modal does not go away when yo…

…u hit enter
mozilla · Mar 18, 2011 · da33717 · da33717
1 parent f2c30a5
commit da33717
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/media/base/js/FlightDeck.Modal.js b/media/base/js/FlightDeck.Modal.js
@@ -144,14 +144,19 @@ FlightDeck = Class.refactor(FlightDeck,{
 
 		//auto focus first input if it exists
 		//also listen for the enter key if a text input exists
-		textboxes = $(display).getElements('input[type="text"]').addEvent(
-                'keyup:keys(enter)', function(e) {
-			e.preventDefault();
-            if (main_callback) {
-    			main_callback();
-            }
+		function pressEnter(e) {
+			e.stop();
+			main_callback();
+			display.destroy();
+		}
+
+		window.addEvent('keyup:keys(enter)', pressEnter);
+		display.addEvent('destroy', function() {
+			window.removeEvent('keyup:keys(enter)', pressEnter);
 		});
 
+		textboxes = $(display).getElements('input[type="text"]');
+
 		if (data.focus && textboxes.length) {
 			setTimeout(function() {
 				textboxes[0].focus();