Skip to content
Snippets Groups Projects
Commit b60385c5 authored by Ben Adida's avatar Ben Adida
Browse files

fixed jquery link

parent 4f35592b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
browserid/static/dialog/controllers/dialog_controller.js
+ 11
− 1
View file @ b60385c5
......@@ -15,14 +15,24 @@ $.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) {
$('.submit').click();
e.preventDefault();
}
});
>>>>>>> Stashed changes
},
"#signin click": function(event) {
var email = $("#email_input").val();
var pass = $("#password_input").val();
......
browserid/static/prove.html
+ 2
− 2
View file @ b60385c5
......@@ -5,7 +5,7 @@
<title>BrowserID - My Account</title>
<link rel="stylesheet" href="css/style.css" type="text/css">
</head>
<body onload="display_saved_ids()">
<body>
<div id="splash">
<div class="topquarter">
<div>
......@@ -37,7 +37,7 @@
</div>
</div>
</body>
<script src="dialog/jquery-min.js"></script>
<script src="js/jquery-1.6.2.min.js"></script>
<script>
function getParameterByName( name )
{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment