From 1738654eba21bf5388c604e54645f0ed3578ff8e Mon Sep 17 00:00:00 2001
From: Shane Tomlinson <stomlinson@mozilla.com>
Date: Wed, 18 Apr 2012 16:33:33 +0100
Subject: [PATCH] Fix primary email being set as most recently used if the user
cancels redirect to authenticate with primary.
issue #968
---
resources/static/dialog/controllers/pick_email.js | 3 ---
resources/static/test/cases/controllers/pick_email.js | 3 +--
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/resources/static/dialog/controllers/pick_email.js b/resources/static/dialog/controllers/pick_email.js
index 3a352f19d..b57933026 100644
--- a/resources/static/dialog/controllers/pick_email.js
+++ b/resources/static/dialog/controllers/pick_email.js
@@ -48,9 +48,6 @@ BrowserID.Modules.PickEmail = (function() {
var valid = checkEmail.call(self, email);
if (valid) {
- var origin = user.getOrigin();
- storage.site.set(origin, "email", email);
-
self.close("email_chosen", { email: email });
}
}
diff --git a/resources/static/test/cases/controllers/pick_email.js b/resources/static/test/cases/controllers/pick_email.js
index 9d3678f8c..7b560c6b5 100644
--- a/resources/static/test/cases/controllers/pick_email.js
+++ b/resources/static/test/cases/controllers/pick_email.js
@@ -76,7 +76,7 @@
equal(label.hasClass("preselected"), false, "the label has no class");
});
- asyncTest("signIn - saves picked email to storage", function() {
+ asyncTest("signIn - trigger 'email_chosen message'", function() {
storage.addEmail("testuser@testuser.com", {});
storage.addEmail("testuser2@testuser.com", {});
@@ -87,7 +87,6 @@
var assertion;
register("email_chosen", function(msg, info) {
- equal(storage.site.get(testOrigin, "email"), "testuser2@testuser.com", "email saved correctly");
ok(info.email, "email_chosen message triggered with email");
start();
});
--
GitLab