merge fix for selecting email addresses by clicking on label in iOS into dev -...

merge fix for selecting email addresses by clicking on label in iOS into dev - closes #1133 closes #1137

resources/static/dialog/controllers/pick_email.js

@@ -65,6 +65,13 @@ BrowserID.Modules.PickEmail = (function() {
     return identities;
   }
 
+  function selectEmail(event) {
+    var target = dom.getAttr(event.currentTarget, "for");
+    if(target) {
+      dom.setAttr("#" + target, "checked", "checked");
+    }
+  }
+
   var Module = bid.Modules.PageModule.extend({
     start: function(options) {
       var origin = user.getOrigin(),
@@ -91,6 +98,7 @@ BrowserID.Modules.PickEmail = (function() {
       }
 
       self.bind("#useNewEmail", "click", cancelEvent(addEmail));
+      self.bind("#selectEmail label", "click", selectEmail);
 
       sc.start.call(self, options);
 

resources/static/test/cases/controllers/pick_email.js

@@ -155,5 +155,17 @@
     controller.addEmail();
   });
 
+  test("click on an email label - select corresponding radio button", function() {
+    storage.addEmail("testuser@testuser.com", {});
+    storage.addEmail("testuser2@testuser.com", {});
+
+    createController(false);
+
+    equal($("#testuser_testuser_com").is(":checked"), false, "radio button is not selected before click.");
+    $("label[for=testuser_testuser_com]").trigger("click");
+
+    equal($("#testuser_testuser_com").is(":checked"), true, "radio button is correctly selected");
+  });
+
 }());