From 141b39eda3a021fdac9515c453745e9e59506535 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-10-244-133-95.us-west-2.compute.internal>
Date: Tue, 10 Sep 2013 06:24:11 +0000
Subject: [PATCH] VRFS584

---
 app/assets/javascripts/accounts_identity.js          | 12 ++++++++++--
 app/assets/stylesheets/client/screen_common.css.scss |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/accounts_identity.js b/app/assets/javascripts/accounts_identity.js
index f55ce5027..1455e1dc9 100644
--- a/app/assets/javascripts/accounts_identity.js
+++ b/app/assets/javascripts/accounts_identity.js
@@ -80,11 +80,16 @@
         function handleUpdateEmail() {
             resetForm();
 
+            $('#account-edit-email-submit').addClass('button-disabled');
+            $('#account-edit-email-submit').bind('click', false);
+
             $('#email-update-password-dialog *').show();
             $('#email-update-password-dialog input[name=password]').focus();
         }
 
         function handleUpdateEmailPasswordPromptCancel() {
+            $('#account-edit-email-submit').removeClass('button-disabled');
+            $('#account-edit-email-submit').unbind('click', false);
             $('#email-update-password-dialog *').hide();
             $('#email-update-password-dialog input[name=password]').val('');
         }
@@ -128,6 +133,8 @@
         }
 
         function postUpdateEmailSuccess(response, email) {
+            $('#account-edit-email-submit').removeClass('button-disabled');
+            $('#account-edit-email-submit').unbind('click', false);
             app.notify(
                 {   title: "Confirmation Email Sent",
                     text: "A confirmation email should arrive shortly at " + email + ". Please click the confirmation link in it to confirm your email change."
@@ -136,7 +143,8 @@
         }
 
         function postUpdateEmailFailure(xhr, textStatus, errorMessage) {
-
+            $('#account-edit-email-submit').removeClass('button-disabled');
+            $('#account-edit-email-submit').unbind('click', false);
             var errors = JSON.parse(xhr.responseText)
 
             if(xhr.status == 422) {
@@ -225,4 +233,4 @@
         return this;
     };
 
-})(window,jQuery);
\ No newline at end of file
+})(window,jQuery);
diff --git a/app/assets/stylesheets/client/screen_common.css.scss b/app/assets/stylesheets/client/screen_common.css.scss
index 8384f6f11..0edcc5c43 100644
--- a/app/assets/stylesheets/client/screen_common.css.scss
+++ b/app/assets/stylesheets/client/screen_common.css.scss
@@ -218,7 +218,6 @@ small {
     color:#EEE;
     background-color:#666;
     cursor:default;
-    content: "Hang on..."
 }
 
 .button-disabled:hover{