Update 2017-08-01T02:59:10.832Z

app/settings/views/settingsChangeEmail.html

@@ -2,7 +2,8 @@
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h4 class="modal-title" id="changeEmailModelLabel"><i class="fa fa-at"></i> Change Email</h4>
 </div>
-<form name="changeEmailForm" ng-submit="changeEmailForm.$valid && token(model)" api-form="tokenPromise" ng-show="!tokenSent && !processing">
+<form name="changeEmailForm" ng-submit="changeEmailForm.$valid && token(model, changeEmailForm)" api-form="tokenPromise"
+      ng-show="!tokenSent">
     <div class="modal-body">
         <p>Below you can change your account's email address.</p>
         <div class="callout callout-danger validation-errors" ng-show="changeEmailForm.$errors">
@@ -29,26 +30,28 @@
     </div>
 </form>
 <form name="changeEmailConfirmForm" ng-submit="changeEmailConfirmForm.$valid && confirm(model)" api-form="confirmPromise"
-      ng-show="tokenSent && !processing">
+      ng-show="tokenSent">
     <div class="modal-body">
         <p>We have emailed a verification code to <b>{{model.newEmail}}</b>. Please check your email for this code and enter it below to finalize your the email address change.</p>
         <div class="callout callout-warning">
             <h4><i class="fa fa-warning"></i> Warning</h4>
             Proceeding will log you out of your current session, requiring you to log back in.
         </div>
+        <div class="callout callout-danger validation-errors" ng-show="changeEmailConfirmForm.$errors">
+            <h4>Errors have occurred</h4>
+            <ul>
+                <li ng-repeat="e in changeEmailConfirmForm.$errors">{{e}}</li>
+            </ul>
+        </div>
         <div class="form-group" show-errors>
             <label for="token">Code</label>
             <input type="number" id="token" name="Token" ng-model="model.token" class="form-control" required api-field />
         </div>
     </div>
     <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-flat">
-            Change Email
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="changeEmailConfirmForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="changeEmailConfirmForm.$loading"></i>Change Email
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
 </form>
-<div ng-show="processing" class="modal-body text-center">
-    <p><i class="fa fa-cog fa-spin fa-3x"></i></p>
-    <p>Please wait. We are now changing your email and reencrypting all of your data. Do not close this window. You will be automatically logged out when this process has finished.</p>
-</div>

app/settings/views/settingsChangePassword.html

@@ -2,7 +2,7 @@
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h4 class="modal-title" id="changePasswrdModelLabel"><i class="fa fa-key"></i> Change Password</h4>
 </div>
-<form name="changePasswordForm" ng-submit="changePasswordForm.$valid && save(model, changePasswordForm)" api-form="savePromise" ng-show="!processing">
+<form name="changePasswordForm" ng-submit="changePasswordForm.$valid && save(model, changePasswordForm)" api-form="savePromise">
     <div class="modal-body">
         <p>Below you can change your account's master password.</p>
         <p>We recommend that you change your master password immediately if you believe that your credentials have been compromised.</p>
@@ -34,13 +34,9 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-flat">
-            Change Password
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="changePasswordForm.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="changePasswordForm.$loading"></i>Change Password
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
 </form>
-<div ng-show="processing" class="modal-body text-center">
-    <p><i class="fa fa-cog fa-spin fa-3x"></i></p>
-    <p>Please wait. We are now changing your password and reencrypting all of your data. Do not close this window. You will be automatically logged out when this process has finished.</p>
-</div>

app/settings/views/settingsUpdateKey.html

@@ -2,7 +2,7 @@
     <button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
     <h4 class="modal-title"><i class="fa fa-key"></i> Update Encryption Key</h4>
 </div>
-<form name="form" ng-submit="form.$valid && save(form)" api-form="savePromise" ng-show="!processing">
+<form name="form" ng-submit="form.$valid && save(form)" api-form="savePromise">
     <div class="modal-body">
         <p>
             This is <b>NOT</b> a security notification indicating that anything is wrong or has been compromised on your
@@ -39,16 +39,9 @@
         </div>
     </div>
     <div class="modal-footer">
-        <button type="submit" class="btn btn-primary btn-flat">
-            Update Key
+        <button type="submit" class="btn btn-primary btn-flat" ng-disabled="form.$loading">
+            <i class="fa fa-refresh fa-spin loading-icon" ng-show="form.$loading"></i>Update Key
         </button>
         <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
     </div>
 </form>
-<div ng-show="processing" class="modal-body text-center">
-    <p><i class="fa fa-cog fa-spin fa-3x"></i></p>
-    <p>
-        Please wait. We are now generating a new encryption key and reencrypting all of your data. Do not close this window.
-        You will be automatically logged out when this process has finished.
-    </p>
-</div>

index.html

@@ -60,9 +60,9 @@
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
           integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
     <meta name="x-stylesheet-test" content="" class="fa invisible" />
-    <script src="js/fallback-styles.min.js?v=girhs6skyb9"></script>
+    <script src="js/fallback-styles.min.js?v=5quorfnu3di"></script>
 
-    <link rel="stylesheet" href="css/vault.min.css?v=girhs6skyb9" />
+    <link rel="stylesheet" href="css/vault.min.css?v=5quorfnu3di" />
 </head>
 <body ng-controller="mainController as main" class="layout-boxed skin-blue sidebar-mini {{main.bodyClass}}"
       ng-class="{'using-control-sidebar': main.usingControlSidebar,
@@ -75,10 +75,10 @@
             integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
     <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.3/angular.min.js"
             integrity="sha384-AH/e+s4V4kUifvnNED2x1XZqArO5qTFU4YKRzUXbz4IgPG1H0Xmz6fP1XUmO4vT/" crossorigin="anonymous"></script>
-    <script src="js/fallback-scripts.min.js?v=girhs6skyb9"></script>
+    <script src="js/fallback-scripts.min.js?v=5quorfnu3di"></script>
 
-    <script src="js/lib.min.js?v=girhs6skyb9"></script>
-    <script src="js/bw.min.js?v=girhs6skyb9"></script>
-    <script src="js/app.min.js?v=girhs6skyb9"></script>
+    <script src="js/lib.min.js?v=5quorfnu3di"></script>
+    <script src="js/bw.min.js?v=5quorfnu3di"></script>
+    <script src="js/app.min.js?v=5quorfnu3di"></script>
 </body>
 </html>

js/fallback-styles.min.js

@@ -1 +1 @@
-function loadStylesheetIfMissing(e,t,s){var i=document.getElementsByTagName("SCRIPT"),l=i[i.length-1].previousElementSibling,n=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(l):l.currentStyle;if(n&&n[e]!==t)for(var o=0;o<s.length;o++)document.write('<link rel="stylesheet" href="'+s[o]+"?v="+cacheTag+'" />')}var cacheTag="girhs6skyb9";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);
+function loadStylesheetIfMissing(e,t,i){var s=document.getElementsByTagName("SCRIPT"),n=s[s.length-1].previousElementSibling,o=document.defaultView&&document.defaultView.getComputedStyle?document.defaultView.getComputedStyle(n):n.currentStyle;if(o&&o[e]!==t)for(var l=0;l<i.length;l++)document.write('<link rel="stylesheet" href="'+i[l]+"?v="+cacheTag+'" />')}var cacheTag="5quorfnu3di";loadStylesheetIfMissing("visibility","hidden",["lib/bootstrap/css/bootstrap.min.css"]),loadStylesheetIfMissing("fontFamily","FontAwesome",["lib/font-awesome/css/font-awesome.min.css"]);

u2f-connector.html

@@ -5,6 +5,6 @@
     <title>U2F Connector</title>
 </head>
 <body>
-    <script src="js/u2f.min.js?v=girhs6skyb9"></script>
+    <script src="js/u2f.min.js?v=5quorfnu3di"></script>
 </body>
 </html>