From 530f5e77419f93f10fb3f1e77a2916d972d604d5 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Tue, 15 Apr 2014 03:01:57 +0400 Subject: [PATCH] Fix decrypt message password input focus (Closes #133) --- dev/ViewModels/MailBoxMessageViewViewModel.js | 6 +++++- rainloop/v/0.0.0/app/templates/Views/MailMessageView.html | 2 +- rainloop/v/0.0.0/static/js/app.js | 6 +++++- rainloop/v/0.0.0/static/js/app.min.js | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dev/ViewModels/MailBoxMessageViewViewModel.js b/dev/ViewModels/MailBoxMessageViewViewModel.js index d5c4e47e5..77150b236 100644 --- a/dev/ViewModels/MailBoxMessageViewViewModel.js +++ b/dev/ViewModels/MailBoxMessageViewViewModel.js @@ -358,7 +358,11 @@ MailBoxMessageViewViewModel.prototype.onBuild = function (oDom) ; this.message.focused.subscribe(function (bValue) { - this.messageDomFocused(!!bValue); + if (bValue && !Utils.inFocus()) { + this.messageDomFocused(true); + } else { + this.messageDomFocused(false); + } }, this); this.messageDomFocused.subscribe(function (bValue) { diff --git a/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html b/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html index a3af6ac3e..690bdb4b5 100644 --- a/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html +++ b/rainloop/v/0.0.0/app/templates/Views/MailMessageView.html @@ -237,7 +237,7 @@       - +