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

Fix rename in header in view/edit and compactHeader mode

Browse source
This commit is contained in:
Julia Radzhabova 2022-05-05 19:18:30 +03:00
parent bc0c5738b1
commit 97d3628998
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/common/main/lib/view/Header.js
View file

@ -214,14 +214,21 @@ define([
this.imgCrypted = this.labelDocName.parent().find('.crypted'); this.imgCrypted = this.labelDocName.parent().find('.crypted');
} }
var $parent = this.labelDocName.parent();
if (!config.isEdit || !config.customization || !config.customization.compactHeader) { if (!config.isEdit || !config.customization || !config.customization.compactHeader) {
var $parent = this.labelDocName.parent();
var _left_width = $parent.position().left, var _left_width = $parent.position().left,
_right_width = $parent.next().outerWidth(); _right_width = $parent.next().outerWidth();
if ( _left_width < _right_width ) if ( _left_width < _right_width )
this.labelDocName.parent().css('padding-left', _right_width - _left_width); $parent.css('padding-left', Math.max(2, _right_width - _left_width));
else this.labelDocName.parent().css('padding-right', _left_width - _right_width); else
$parent.css('padding-right', Math.max(2, _left_width - _right_width));
}
if (!(config.customization && config.customization.toolbarHideFileName) && (!config.isEdit || config.customization && config.customization.compactHeader)) {
var basis = parseFloat($parent.css('padding-left') || 0) + parseFloat($parent.css('padding-right') || 0) + parseInt(this.labelDocName.css('min-width') || 50); // 2px - box-shadow
$parent.css('flex-basis', Math.ceil(basis) + 'px');
$parent.closest('.extra.right').css('flex-basis', Math.ceil(basis) + $parent.next().outerWidth() + 'px');
} }
} }
} }
@ -759,11 +766,7 @@ define([
else else
name = this.labelDocName.val(); name = this.labelDocName.val();
var width = this.getTextWidth(name); var width = this.getTextWidth(name);
if (width>=0) (width>=0) && this.labelDocName.width(width);
{
this.labelDocName.width(width);
Common.NotificationCenter.trigger('window:resize');
}
}, },
getTextWidth: function(text) { getTextWidth: function(text) {

8
apps/common/main/resources/less/header.less
View file

@ -51,6 +51,8 @@
&.right { &.right {
flex-grow: 1; flex-grow: 1;
flex-shrink: 0;
overflow: hidden;
} }
.status-label { .status-label {
@ -94,7 +96,9 @@
flex-grow: 1; flex-grow: 1;
display: flex; display: flex;
justify-content: center; justify-content: center;
padding: 4px 0px; padding: 4px 2px;
overflow: hidden;
flex-shrink: 0;
} }
#rib-doc-name { #rib-doc-name {
@ -495,7 +499,7 @@
display: flex; display: flex;
justify-content: center; justify-content: center;
overflow: hidden; overflow: hidden;
padding: 4px 0px 2px 2px; padding: 4px 2px;
} }
#title-doc-name { #title-doc-name {

5
apps/common/main/resources/less/toolbar.less
View file

@ -60,8 +60,7 @@
position: relative; position: relative;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-shrink: 1;
min-width: 150px;
> ul { > ul {
padding: 4px 0 0; padding: 4px 0 0;
@ -561,7 +560,7 @@
} }
&.style-skip-docname .toolbar { &.style-skip-docname .toolbar {
#box-doc-name > label { #box-doc-name > input {
display: none; display: none;
} }
} }