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

Close button menu when resize toolbar

Browse source
This commit is contained in:
Julia Radzhabova 2022-01-12 21:46:26 +03:00
parent 0f304cbd6e
commit b8ccb8533f
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -527,7 +527,8 @@ define([
box_controls_width = $active.parents('.box-controls').width(), box_controls_width = $active.parents('.box-controls').width(),
_maxright = box_controls_width, _maxright = box_controls_width,
_rightedge = $active.get(0).getBoundingClientRect().right, _rightedge = $active.get(0).getBoundingClientRect().right,
delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1; delta = (this._prevBoxWidth) ? (_maxright - this._prevBoxWidth) : -1,
hideAllMenus = false;
this._prevBoxWidth = _maxright; this._prevBoxWidth = _maxright;
more_section.is(':visible') && (_maxright -= more_section_width); more_section.is(':visible') && (_maxright -= more_section_width);
@ -557,6 +558,7 @@ define([
if (!item.is(':visible')) { // move invisible items as is and set special attr if (!item.is(':visible')) { // move invisible items as is and set special attr
item.attr('data-hidden-tb-item', true); item.attr('data-hidden-tb-item', true);
this.$moreBar.prepend(item); this.$moreBar.prepend(item);
hideAllMenus = true;
} else if (item.hasClass('group')) { } else if (item.hasClass('group')) {
_rightedge = $active.get(0).getBoundingClientRect().right; _rightedge = $active.get(0).getBoundingClientRect().right;
if (_rightedge <= _maxright) // stop moving items if (_rightedge <= _maxright) // stop moving items
@ -578,6 +580,7 @@ define([
if (last_separator) { if (last_separator) {
last_separator.css('display', ''); last_separator.css('display', '');
} }
hideAllMenus = true;
} else if ( offset.left+item_width > _maxright ) { } else if ( offset.left+item_width > _maxright ) {
// move buttons from group // move buttons from group
for (var j=children.length-1; j>=0; j--) { for (var j=children.length-1; j>=0; j--) {
@ -587,6 +590,7 @@ define([
if (last_separator) { if (last_separator) {
last_separator.css('display', ''); last_separator.css('display', '');
} }
hideAllMenus = true;
break; break;
} else { } else {
var child_offset = child.offset(), var child_offset = child.offset(),
@ -605,6 +609,7 @@ define([
} }
} }
last_group.prepend(child); last_group.prepend(child);
hideAllMenus = true;
} else { } else {
need_break = true; need_break = true;
break; break;
@ -628,6 +633,7 @@ define([
this.$moreBar.prepend(item); this.$moreBar.prepend(item);
item.css('display', 'none'); item.css('display', 'none');
last_separator = item; last_separator = item;
hideAllMenus = true;
} }
} }
} else if ((reset || delta>0) && more_section.is(':visible')) { } else if ((reset || delta>0) && more_section.is(':visible')) {
@ -676,6 +682,7 @@ define([
this.hideMoreBtns(); this.hideMoreBtns();
more_section.css('display', "none"); more_section.css('display', "none");
} }
hideAllMenus = true;
} else if ( _rightedge + last_width < _maxright) { } else if ( _rightedge + last_width < _maxright) {
// move buttons from group // move buttons from group
var children = item.children(); var children = item.children();
@ -707,6 +714,7 @@ define([
} }
} }
last_group.append(child); last_group.append(child);
hideAllMenus = true;
} else { } else {
need_break = true; need_break = true;
break; break;
@ -735,6 +743,7 @@ define([
item.css('display', 'none'); item.css('display', 'none');
last_separator = item; last_separator = item;
last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1; last_width = parseInt(last_separator.css('margin-left')) + parseInt(last_separator.css('margin-right')) + 1;
hideAllMenus = true;
} }
} }
} else { } else {
@ -742,6 +751,7 @@ define([
more_section.css('display', "none"); more_section.css('display', "none");
} }
} }
hideAllMenus && Common.UI.Menu.Manager.hideAll();
}, },
onMoreHide: function(btn, e) { onMoreHide: function(btn, e) {