From 7558080e54deb9a80d22bdb98fed9d5927d67f07 Mon Sep 17 00:00:00 2001 From: Dario Chiappetta Date: Mon, 30 Nov 2015 14:12:27 +0100 Subject: [PATCH] Fixed overlay glitch --- frontend/delta/js/Clipperz/PM/UI/Components/Overlay.js | 2 ++ frontend/delta/js/Clipperz/PM/UI/MainController.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/Overlay.js b/frontend/delta/js/Clipperz/PM/UI/Components/Overlay.js index 263d021..4360a50 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/Overlay.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/Overlay.js @@ -56,6 +56,8 @@ Clipperz.Base.extend(Clipperz.PM.UI.Components.Overlay, Object, { 'show': function (aMessage, showMask, showProgress, showOnCardDetail) { if (showMask === true) { this.showMask(showOnCardDetail); + } else { + this.hideMask(); } if (showProgress === true) { diff --git a/frontend/delta/js/Clipperz/PM/UI/MainController.js b/frontend/delta/js/Clipperz/PM/UI/MainController.js index bc99158..4d2df25 100644 --- a/frontend/delta/js/Clipperz/PM/UI/MainController.js +++ b/frontend/delta/js/Clipperz/PM/UI/MainController.js @@ -362,7 +362,7 @@ Clipperz.log("THE BROWSER IS OFFLINE"); user = null; - this.overlay().show("logging in"); + this.overlay().show("logging in", false, false); this.pages()['loginPage'].setProps({disabled:true}); if ('pin' in someCredentials) { @@ -447,7 +447,7 @@ Clipperz.log("THE BROWSER IS OFFLINE"); var unlockPage = this.pages()['unlockPage']; var overlay = this.overlay(); - overlay.show("validating…"); + overlay.show("validating…", false); passphrase = (aCredentialType=='PIN') ? Clipperz.PM.PIN.credentialsWithPIN(aCredential)['passphrase'] : aCredential; getPassphraseDelegate = MochiKit.Base.partial(MochiKit.Async.succeed, passphrase);