From fec4b9778965792c58b032eeeb5c96d7458fd035 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Thu, 14 Jul 2011 10:13:38 -0700
Subject: [PATCH] removed conflict
---
browserid/static/dialog/controllers/dialog_controller.js | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/browserid/static/dialog/controllers/dialog_controller.js b/browserid/static/dialog/controllers/dialog_controller.js
index f77f16ad3..0ee666eb2 100644
--- a/browserid/static/dialog/controllers/dialog_controller.js
+++ b/browserid/static/dialog/controllers/dialog_controller.js
@@ -15,14 +15,6 @@ $.Controller("Dialog", {}, {
},
-<<<<<<< Updated upstream
- // this is not working yet
- "input keyup": function(e){
- if(e.which == 13) {
- $('.submit').click();
- e.preventDefault();
- }
-=======
setupEnterKey: function() {
$("input").keyup(function(e) {
if(e.which == 13) {
@@ -30,7 +22,6 @@ $.Controller("Dialog", {}, {
e.preventDefault();
}
});
->>>>>>> Stashed changes
},
"#signin click": function(event) {
--
GitLab