From f4665e4ad9dd5347317c82001f224695c1f94e47 Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 31 Aug 2011 16:21:53 -0700
Subject: [PATCH] Hooking up the new user flow.
Putting the js to handle form submission into the respective ejs file until we have a good way of separating form elements and binding onto individual forms.
---
browserid/static/js/browserid.js | 20 --------------------
browserid/views/layout.ejs | 2 ++
browserid/views/signin.ejs | 21 ++++++++++++++++++++-
browserid/views/signup.ejs | 21 ++++++++++++++++++++-
4 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/browserid/static/js/browserid.js b/browserid/static/js/browserid.js
index 76e66f0ea..451f3a369 100644
--- a/browserid/static/js/browserid.js
+++ b/browserid/static/js/browserid.js
@@ -135,26 +135,6 @@ $(function() {
}
});
- // This is for the signup page
- $("#signUpForm").bind("submit", function(event) {
- event.preventDefault();
-
- var email = $("#email").val(),
- password = $("#password").val();
-
- BrowserIDNetwork.authenticate(email, password, function onSuccess(authenticated) {
- if (authenticated) {
- document.location = '/';
- }
- else {
- // bad authentication
- }
- }, function onFailure() {
- // Wah wah. Network error
- });
- });
-
-
});
function display_saved_ids()
diff --git a/browserid/views/layout.ejs b/browserid/views/layout.ejs
index 50df1e2da..e13d8d911 100644
--- a/browserid/views/layout.ejs
+++ b/browserid/views/layout.ejs
@@ -14,6 +14,8 @@
<script src="/js/jquery-1.6.2.min.js" type="text/javascript"></script>
<script src="/dialog/resources/storage.js" type="text/javascript"></script>
+ <script src="/dialog/resources/crypto-api.js" type="text/javascript"></script>
+ <script src="/dialog/resources/crypto.js" type="text/javascript"></script>
<script src="/dialog/resources/browserid-network.js" type="text/javascript"></script>
<script src="/dialog/resources/browserid-identities.js" type="text/javascript"></script>
<script src="/dialog/resources/underscore-min.js" type="text/javascript"></script>
diff --git a/browserid/views/signin.ejs b/browserid/views/signin.ejs
index 3eae1fd67..0288c769d 100644
--- a/browserid/views/signin.ejs
+++ b/browserid/views/signin.ejs
@@ -33,6 +33,25 @@
<script type="text/javascript">
$(document).ready(function () {
- $('form input:visible:first').focus();
+ $("form input:visible:first").focus();
+
+ $("#signUpForm").bind("submit", function(event) {
+ event.preventDefault();
+
+ var email = $("#email").val(),
+ password = $("#password").val();
+
+ BrowserIDNetwork.authenticate(email, password, function onSuccess(authenticated) {
+ if (authenticated) {
+ document.location = "/";
+ }
+ else {
+ // bad authentication
+ }
+ }, function onFailure() {
+ // Wah wah. Network error
+ });
+ });
+
});
</script>
diff --git a/browserid/views/signup.ejs b/browserid/views/signup.ejs
index 6207496ff..33b4654dc 100644
--- a/browserid/views/signup.ejs
+++ b/browserid/views/signup.ejs
@@ -29,6 +29,25 @@
<script type="text/javascript">
$(document).ready(function () {
- $('form input:visible:first').focus();
+ $("form input:visible:first").focus();
+
+ $("#signUpForm").bind("submit", function(event) {
+ event.preventDefault();
+
+ var email = $("#email").val(),
+ password = $("#password").val();
+
+ BrowserIDIdentities.stageIdentity(email, password, function onSuccess(authenticated) {
+ if (authenticated) {
+ document.location = "/";
+ }
+ else {
+ // bad authentication
+ }
+ }, function onFailure() {
+ // Wah wah. Network error
+ });
+ });
+
});
</script>
--
GitLab