Merge branch 'soon' into staging

2018-07-18 15:56:44 +02:00
parent ebce0024d7 58332a9ce3
commit a181c09a68
3 changed files with 8 additions and 0 deletions
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -431,10 +431,16 @@ define([
            UI.confirm(Messages.settings_changePasswordConfirm,
            function (yes) {
                if (!yes) { return; }
+
+                UI.addLoadingScreen({
+                    hideTips: true,
+                    loadingText: Messages.settings_changePasswordPending,
+                });
                updateBlock({
                    password: oldPassword,
                    newPassword: newPassword
                }, function (obj) {
+                    UI.removeLoadingScreen();
                    if (obj && obj.error) {
                        // TODO
                        UI.alert(Messages.settings_changePasswordError);