From 610dfce6cda6172aef26080be8d4f6d50d4e84fb Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Fri, 30 Sep 2011 16:44:53 +0100
Subject: [PATCH] Updating merged portions for new namespace.
---
browserid/static/js/pages/forgot.js | 4 ++--
browserid/static/js/pages/verify_email_address.js | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/browserid/static/js/pages/forgot.js b/browserid/static/js/pages/forgot.js
index 9ee24e23a..bbd205ee0 100644
--- a/browserid/static/js/pages/forgot.js
+++ b/browserid/static/js/pages/forgot.js
@@ -1,4 +1,4 @@
-/*globals BrowserID: true, BrowserIDNetwork: true, $:true */
+/*globals BrowserID: true, $:true */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@@ -53,7 +53,7 @@ BrowserID.forgot = (function() {
return false;
}
- BrowserIDIdentities.createUser(email, function onSuccess(keypair) {
+ BrowserID.Identities.createUser(email, function onSuccess(keypair) {
$('#sent_to_email').html(email);
$('#forminputs').fadeOut();
$(".notifications .notification.emailsent").fadeIn();
diff --git a/browserid/static/js/pages/verify_email_address.js b/browserid/static/js/pages/verify_email_address.js
index 52a235348..973afc65e 100644
--- a/browserid/static/js/pages/verify_email_address.js
+++ b/browserid/static/js/pages/verify_email_address.js
@@ -37,7 +37,9 @@
(function() {
"use strict";
- BrowserID.verifyEmailAddress = function(token) {
+ var bid = BrowserID;
+
+ bid.verifyEmailAddress = function(token) {
$("#signUpForm").submit(function(event) {
event.preventDefault();
@@ -46,7 +48,7 @@
pass2 = $("#vpassword").val();
if (pass && pass === pass2) {
- BrowserID.Network.completeUserRegistration(token, pass, function onSuccess(registered) {
+ bid.Network.completeUserRegistration(token, pass, function onSuccess(registered) {
if (registered) {
$("#congrats").fadeIn(250);
}
@@ -56,7 +58,7 @@
}
});
- var staged = BrowserIDStorage.getStagedOnBehalfOf();
+ var staged = bid.Storage.getStagedOnBehalfOf();
if (staged) {
$('.website').html(staged);
}
@@ -65,7 +67,7 @@
}
// go get the email address
- BrowserIDNetwork.emailForVerificationToken(token, function(email) {
+ bid.Network.emailForVerificationToken(token, function(email) {
if (email) {
$('#email').val(email);
}
--
GitLab