Small fixes

This commit is contained in:
RainLoop Team 2014-05-20 20:00:59 +04:00
parent 8ac9920ec8
commit be77754286
10 changed files with 71 additions and 77 deletions

View file

@ -15,6 +15,11 @@ Globals.momentTrigger = ko.observable(true);
*/ */
Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0}); Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0});
/**
* @type {?}
*/
Globals.tooltipTrigger = ko.observable(false).extend({'rateLimit': 0});
/** /**
* @type {?} * @type {?}
*/ */

View file

@ -27,11 +27,8 @@ ko.bindingHandlers.tooltip = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
} }
@ -61,11 +58,8 @@ ko.bindingHandlers.tooltip2 = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
}; };
@ -83,17 +77,13 @@ ko.bindingHandlers.tooltip3 = {
} }
}); });
Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue)
{
$oEl.tooltip('hide');
}
});
$document.click(function () { $document.click(function () {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.tooltipTrigger.subscribe(function () {
$oEl.tooltip('hide');
});
}, },
'update': function (oElement, fValueAccessor) { 'update': function (oElement, fValueAccessor) {
var sValue = ko.utils.unwrapObservable(fValueAccessor()); var sValue = ko.utils.unwrapObservable(fValueAccessor());

View file

@ -122,6 +122,8 @@ Knoin.prototype.buildViewModel = function (ViewModelClass, oScreen)
RL.popupVisibilityNames.remove(this.viewModelName); RL.popupVisibilityNames.remove(this.viewModelName);
oViewModel.viewModelDom.css('z-index', 2000); oViewModel.viewModelDom.css('z-index', 2000);
Globals.tooltipTrigger(!Globals.tooltipTrigger());
_.delay(function () { _.delay(function () {
self.viewModelDom.hide(); self.viewModelDom.hide();
}, 300); }, 300);

View file

@ -52,6 +52,7 @@ function AbstractData()
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue) if (bValue)
{ {
Globals.tooltipTrigger(!Globals.tooltipTrigger());
this.keyScope(Enums.KeyState.Menu); this.keyScope(Enums.KeyState.Menu);
} }
else if (Enums.KeyState.Menu === key.getScope()) else if (Enums.KeyState.Menu === key.getScope())

View file

@ -37,7 +37,7 @@
<ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="identity-label-id"> <ul class="dropdown-menu g-ui-menu" role="menu" aria-labelledby="identity-label-id">
<!-- ko foreach: identitiesOptions --> <!-- ko foreach: identitiesOptions -->
<li class="e-item" role="presentation"> <li class="e-item" role="presentation">
<a class="e-link menuitem" tabindex="-1" href="#" data-bind="click: function (oIdentity) { $root.selectIdentity(oIdentity); return true; }"> <a class="e-link menuitem" tabindex="-1" href="javascript:void(0);" data-bind="click: function (oIdentity) { $root.selectIdentity(oIdentity); return true; }">
<span data-bind="text: optText"></span> <span data-bind="text: optText"></span>
</a> </a>
</li> </li>

View file

@ -100,6 +100,11 @@ Globals.momentTrigger = ko.observable(true);
*/ */
Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0}); Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0});
/**
* @type {?}
*/
Globals.tooltipTrigger = ko.observable(false).extend({'rateLimit': 0});
/** /**
* @type {?} * @type {?}
*/ */
@ -2681,11 +2686,8 @@ ko.bindingHandlers.tooltip = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
} }
@ -2715,11 +2717,8 @@ ko.bindingHandlers.tooltip2 = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
}; };
@ -2737,17 +2736,13 @@ ko.bindingHandlers.tooltip3 = {
} }
}); });
Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue)
{
$oEl.tooltip('hide');
}
});
$document.click(function () { $document.click(function () {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.tooltipTrigger.subscribe(function () {
$oEl.tooltip('hide');
});
}, },
'update': function (oElement, fValueAccessor) { 'update': function (oElement, fValueAccessor) {
var sValue = ko.utils.unwrapObservable(fValueAccessor()); var sValue = ko.utils.unwrapObservable(fValueAccessor());
@ -4379,6 +4374,8 @@ Knoin.prototype.buildViewModel = function (ViewModelClass, oScreen)
RL.popupVisibilityNames.remove(this.viewModelName); RL.popupVisibilityNames.remove(this.viewModelName);
oViewModel.viewModelDom.css('z-index', 2000); oViewModel.viewModelDom.css('z-index', 2000);
Globals.tooltipTrigger(!Globals.tooltipTrigger());
_.delay(function () { _.delay(function () {
self.viewModelDom.hide(); self.viewModelDom.hide();
}, 300); }, 300);
@ -6985,6 +6982,7 @@ function AbstractData()
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue) if (bValue)
{ {
Globals.tooltipTrigger(!Globals.tooltipTrigger());
this.keyScope(Enums.KeyState.Menu); this.keyScope(Enums.KeyState.Menu);
} }
else if (Enums.KeyState.Menu === key.getScope()) else if (Enums.KeyState.Menu === key.getScope())

File diff suppressed because one or more lines are too long

View file

@ -104,6 +104,11 @@ Globals.momentTrigger = ko.observable(true);
*/ */
Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0}); Globals.dropdownVisibility = ko.observable(false).extend({'rateLimit': 0});
/**
* @type {?}
*/
Globals.tooltipTrigger = ko.observable(false).extend({'rateLimit': 0});
/** /**
* @type {?} * @type {?}
*/ */
@ -2685,11 +2690,8 @@ ko.bindingHandlers.tooltip = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
} }
@ -2719,11 +2721,8 @@ ko.bindingHandlers.tooltip2 = {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.tooltipTrigger.subscribe(function () {
if (bValue)
{
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}
}); });
} }
}; };
@ -2741,17 +2740,13 @@ ko.bindingHandlers.tooltip3 = {
} }
}); });
Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue)
{
$oEl.tooltip('hide');
}
});
$document.click(function () { $document.click(function () {
$oEl.tooltip('hide'); $oEl.tooltip('hide');
}); });
Globals.tooltipTrigger.subscribe(function () {
$oEl.tooltip('hide');
});
}, },
'update': function (oElement, fValueAccessor) { 'update': function (oElement, fValueAccessor) {
var sValue = ko.utils.unwrapObservable(fValueAccessor()); var sValue = ko.utils.unwrapObservable(fValueAccessor());
@ -5312,6 +5307,8 @@ Knoin.prototype.buildViewModel = function (ViewModelClass, oScreen)
RL.popupVisibilityNames.remove(this.viewModelName); RL.popupVisibilityNames.remove(this.viewModelName);
oViewModel.viewModelDom.css('z-index', 2000); oViewModel.viewModelDom.css('z-index', 2000);
Globals.tooltipTrigger(!Globals.tooltipTrigger());
_.delay(function () { _.delay(function () {
self.viewModelDom.hide(); self.viewModelDom.hide();
}, 300); }, 300);
@ -15317,6 +15314,7 @@ function AbstractData()
Globals.dropdownVisibility.subscribe(function (bValue) { Globals.dropdownVisibility.subscribe(function (bValue) {
if (bValue) if (bValue)
{ {
Globals.tooltipTrigger(!Globals.tooltipTrigger());
this.keyScope(Enums.KeyState.Menu); this.keyScope(Enums.KeyState.Menu);
} }
else if (Enums.KeyState.Menu === key.getScope()) else if (Enums.KeyState.Menu === key.getScope())

File diff suppressed because one or more lines are too long