Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Common] locked timed toolbar collapsing

Browse source
This commit is contained in:
Maxim Kadushkin 2017-08-01 13:17:29 +03:00
parent 1a61bdcf06
commit 52169b80ce
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/common/main/lib/component/Mixtbar.js
View file

@ -125,10 +125,13 @@ define([
optsFold.$bar.toggleClass('expanded', true).addClass('folded'); optsFold.$bar.toggleClass('expanded', true).addClass('folded');
optsFold.$box.on({ optsFold.$box.on({
mouseleave: function (e) { mouseleave: function (e) {
optsFold.timer = setTimeout(me.collapse, optsFold.timeout); // optsFold.timer = setTimeout( function(e) {
// clearTimeout(optsFold.timer);
// me.collapse();
// }, optsFold.timeout);
}, },
mouseenter: function (e) { mouseenter: function (e) {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
} }
}); });
@ -157,26 +160,27 @@ define([
// }); // });
} else { } else {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
optsFold.$bar.removeClass('folded'); optsFold.$bar.removeClass('folded');
optsFold.$box.off(); optsFold.$box.off();
} }
}, },
collapse: function() { collapse: function() {
Common.UI.Menu.Manager.hideAll();
// clearTimeout(optsFold.timer);
if ( this.isFolded && optsFold.$bar ) { if ( this.isFolded && optsFold.$bar ) {
optsFold.$bar.removeClass('expanded'); optsFold.$bar.removeClass('expanded');
optsFold.$bar.find('.tabs .ribtab').removeClass('active'); optsFold.$bar.find('.tabs .ribtab').removeClass('active');
} }
Common.UI.Menu.Manager.hideAll();
}, },
expand: function() { expand: function() {
clearTimeout(optsFold.timer); // clearTimeout(optsFold.timer);
optsFold.$bar.addClass('expanded'); optsFold.$bar.addClass('expanded');
optsFold.timer = setTimeout(this.collapse, optsFold.timeout); // optsFold.timer = setTimeout(this.collapse, optsFold.timeout);
}, },
onResize: function(e) { onResize: function(e) {