diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js index bc7ea2fa4..00a6abc2d 100644 --- a/dev/Common/Globals.js +++ b/dev/Common/Globals.js @@ -15,6 +15,11 @@ Globals.momentTrigger = ko.observable(true); */ Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0}); +/** + * @type {?} + */ +Globals.tooltipTrigger = ko.observable(false).extend({'rateLimit': 0}); + /** * @type {?} */ diff --git a/dev/Common/Knockout.js b/dev/Common/Knockout.js index 244f01c1e..171c63456 100644 --- a/dev/Common/Knockout.js +++ b/dev/Common/Knockout.js @@ -27,11 +27,8 @@ ko.bindingHandlers.tooltip = { $oEl.tooltip('hide'); }); - Globals.dropdownVisibility.subscribe(function (bValue) { - if (bValue) - { - $oEl.tooltip('hide'); - } + Globals.tooltipTrigger.subscribe(function () { + $oEl.tooltip('hide'); }); } } @@ -61,11 +58,8 @@ ko.bindingHandlers.tooltip2 = { $oEl.tooltip('hide'); }); - Globals.dropdownVisibility.subscribe(function (bValue) { - if (bValue) - { - $oEl.tooltip('hide'); - } + Globals.tooltipTrigger.subscribe(function () { + $oEl.tooltip('hide'); }); } }; @@ -83,17 +77,13 @@ ko.bindingHandlers.tooltip3 = { } }); - Globals.dropdownVisibility.subscribe(function (bValue) { - if (bValue) - { - $oEl.tooltip('hide'); - } - }); - $document.click(function () { $oEl.tooltip('hide'); }); - + + Globals.tooltipTrigger.subscribe(function () { + $oEl.tooltip('hide'); + }); }, 'update': function (oElement, fValueAccessor) { var sValue = ko.utils.unwrapObservable(fValueAccessor()); diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js index 3201af3bf..5fba288b0 100644 --- a/dev/Knoin/Knoin.js +++ b/dev/Knoin/Knoin.js @@ -122,6 +122,8 @@ Knoin.prototype.buildViewModel = function (ViewModelClass, oScreen) RL.popupVisibilityNames.remove(this.viewModelName); oViewModel.viewModelDom.css('z-index', 2000); + Globals.tooltipTrigger(!Globals.tooltipTrigger()); + _.delay(function () { self.viewModelDom.hide(); }, 300); diff --git a/dev/Storages/AbstractData.js b/dev/Storages/AbstractData.js index 05e5215f9..04fa1e5e5 100644 --- a/dev/Storages/AbstractData.js +++ b/dev/Storages/AbstractData.js @@ -52,6 +52,7 @@ function AbstractData() Globals.dropdownVisibility.subscribe(function (bValue) { if (bValue) { + Globals.tooltipTrigger(!Globals.tooltipTrigger()); this.keyScope(Enums.KeyState.Menu); } else if (Enums.KeyState.Menu === key.getScope()) diff --git a/rainloop/v/0.0.0/app/templates/Views/PopupsCompose.html b/rainloop/v/0.0.0/app/templates/Views/PopupsCompose.html index 427c493e7..dfe61a85d 100644 --- a/rainloop/v/0.0.0/app/templates/Views/PopupsCompose.html +++ b/rainloop/v/0.0.0/app/templates/Views/PopupsCompose.html @@ -37,7 +37,7 @@