From 5b424b2a255b7ff05dee7bc429f8821589c2db75 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 27 Apr 2022 11:16:33 +0300 Subject: [PATCH 01/11] change view --- apps/common/main/lib/view/Header.js | 3 +++ apps/common/main/resources/less/header.less | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 21081a00bb..5db007d8d8 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -343,7 +343,9 @@ define([ me.withoutExt = true; _.delay(function(){ me.setDocTile(name); + me.labelDocName.select(); },100); + me.labelDocName.addClass('active-title'); } function onDocNameKeyDown(e) { @@ -727,6 +729,7 @@ define([ me.withoutExt = false; me.setDocTile(me.documentCaption); } + me.labelDocName.removeClass('active-title'); }, 'paste': function (e) { setTimeout(function() { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 5bd584d653..9df6d3f5c8 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -499,6 +499,15 @@ background-color: transparent; border: 0 none; cursor: default; + + &:hover,&.active-title{ + border: @highlight-header-button-hover solid 2px; + border-radius: 3px; + } + &.active-title{ + cursor: text; + } + } .lr-separator { @@ -510,7 +519,7 @@ .inner-box-icon.crypted { width: 20px; position: relative; - + margin-right: 1px; > svg { position: absolute; width: 20px; From 3fe450ef0b1389b254f78a4332b390823f411151 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 27 Apr 2022 11:31:07 +0300 Subject: [PATCH 02/11] cursor for hover --- apps/common/main/resources/less/header.less | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 9df6d3f5c8..701acb4958 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -503,8 +503,6 @@ &:hover,&.active-title{ border: @highlight-header-button-hover solid 2px; border-radius: 3px; - } - &.active-title{ cursor: text; } From f046177e530df7e3fc2f10ca0ab39b1fd7418f49 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 27 Apr 2022 11:49:50 +0300 Subject: [PATCH 03/11] Fix coEditing=null --- apps/documenteditor/main/app/controller/Main.js | 6 +++--- apps/presentationeditor/main/app/controller/Main.js | 6 +++--- apps/spreadsheeteditor/main/app/controller/Main.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index f841a5cf70..ca0c10bb22 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -473,7 +473,7 @@ define([ docInfo.put_Lang(this.editorConfig.lang); docInfo.put_Mode(this.editorConfig.mode); - if (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) + if (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) docInfo.put_CoEditingMode(this.editorConfig.coEditing.mode); var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); @@ -1548,8 +1548,8 @@ define([ Common.NotificationCenter.on('comments:showdummy', _.bind(this.onShowDummyComment, this)); // change = true by default in editor, change = false by default in viewer - this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || - !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; + this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || + !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; this.loadCoAuthSettings(); this.applyModeCommonElements(); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 69237409dc..ecc312711b 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -430,7 +430,7 @@ define([ docInfo.put_Lang(this.editorConfig.lang); docInfo.put_Mode(this.editorConfig.mode); - if (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) + if (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) docInfo.put_CoEditingMode(this.editorConfig.coEditing.mode); var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); @@ -1195,8 +1195,8 @@ define([ this.editorConfig.customization && Common.UI.FeaturesManager.init(this.editorConfig.customization.features, this.appOptions.canBrandingExt); // change = true by default in editor, change = false by default in viewer - this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || - !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; + this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && this.appOptions.canCoAuthoring && !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || + !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; this.loadCoAuthSettings(); this.applyModeCommonElements(); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index e38e48a332..adc035cd15 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -504,7 +504,7 @@ define([ docInfo.put_Lang(this.editorConfig.lang); docInfo.put_Mode(this.editorConfig.mode); - if (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) + if (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.mode!==undefined) docInfo.put_CoEditingMode(this.editorConfig.coEditing.mode); var enable = !this.editorConfig.customization || (this.editorConfig.customization.macros!==false); @@ -1284,8 +1284,8 @@ define([ // change = true by default in editor, change = false by default in viewer this.appOptions.canChangeCoAuthoring = this.appOptions.isEdit && !(this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge || this.appOptions.isEditOle) && this.appOptions.canCoAuthoring && - !(typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || - !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; + !(this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===false) || + !this.appOptions.isEdit && !this.appOptions.isRestrictedEdit && (this.editorConfig.coEditing && typeof this.editorConfig.coEditing == 'object' && this.editorConfig.coEditing.change===true) ; if (!this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && !this.appOptions.isEditOle) { this.appOptions.canBrandingExt = params.asc_getCanBranding() && (typeof this.editorConfig.customization == 'object' || this.editorConfig.plugins); From c6ef192deaa0e2ab5d7d621e6a3adcb3a7aec4f3 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 27 Apr 2022 13:44:44 +0300 Subject: [PATCH 04/11] restyle --- apps/common/main/lib/view/Header.js | 2 -- apps/common/main/resources/less/header.less | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 5db007d8d8..82fa3526dd 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -345,7 +345,6 @@ define([ me.setDocTile(name); me.labelDocName.select(); },100); - me.labelDocName.addClass('active-title'); } function onDocNameKeyDown(e) { @@ -729,7 +728,6 @@ define([ me.withoutExt = false; me.setDocTile(me.documentCaption); } - me.labelDocName.removeClass('active-title'); }, 'paste': function (e) { setTimeout(function() { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 701acb4958..394487a109 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -495,13 +495,17 @@ overflow: hidden; text-align: center; font-size: 12px; - line-height: 28px; + line-height: 22px; + margin: 2px 0; background-color: transparent; border: 0 none; cursor: default; - &:hover,&.active-title{ - border: @highlight-header-button-hover solid 2px; + &:hover,&:focus{ + box-shadow: 0 0 0 1px @highlight-header-button-hover-ie; + box-shadow: 0 0 0 1px @highlight-header-button-hover; + /*border:@highlight-header-button-hover-ie solid 1px; + border:@highlight-header-button-hover solid 1px;*/ border-radius: 3px; cursor: text; } From 500164357379494e372187ceb801441f5a759d62 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Wed, 27 Apr 2022 14:05:22 +0300 Subject: [PATCH 05/11] fix line-height --- apps/common/main/resources/less/header.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 394487a109..7370b21405 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -495,7 +495,7 @@ overflow: hidden; text-align: center; font-size: 12px; - line-height: 22px; + line-height: 24px; margin: 2px 0; background-color: transparent; border: 0 none; From ecda48303b91fe7528b4b851aa2f23a65a1b6f6b Mon Sep 17 00:00:00 2001 From: OVSharova Date: Thu, 28 Apr 2022 06:46:03 +0300 Subject: [PATCH 06/11] refactoring --- apps/common/main/lib/view/Header.js | 23 ++++++++++++++++----- apps/common/main/resources/less/header.less | 4 ++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 82fa3526dd..cca98e9c1b 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -207,12 +207,12 @@ define([ //config.isCrypted =true; //delete fore merge! if ( this.labelDocName ) { if ( config.isCrypted ) { - this.labelDocName.attr({'style':'text-align: left;'}); this.labelDocName.before( '
' + '' + '
'); this.imgCrypted = this.labelDocName.parent().find('.crypted'); + this.titleAlign = 'left'; } if (!config.isEdit || !config.customization || !config.customization.compactHeader) { @@ -386,7 +386,9 @@ define([ if ( e.keyCode == Common.UI.Keys.ESC ) { Common.NotificationCenter.trigger('edit:complete', this); } else { - me.labelDocName.attr('size', name.length + me.fileExtention.length > 10 ? name.length + me.fileExtention.length : 10); + _.delay(function(){ + me.setDocTile(); + },10); } } @@ -756,10 +758,21 @@ define([ return (name.substring(idx) == this.fileExtention) ? name.substring(0, idx) : name ; }, setDocTile: function(name){ - this.labelDocName.val(name); - var ln = this.withoutExt ? this.fileExtention.length : 0; - this.labelDocName.attr('size', name.length + ln > 10 ? name.length + ln : 10); + if(name) + this.labelDocName.val(name); + else + name = this.labelDocName.val(); + var font ="12.5px Arial, Helvetica, \"Helvetica Neue\", sans-serif"; + var align = (this.titleAlign)?'text-align: ' + this.titleAlign + '; margin-left: 1px; ':''; + this.labelDocName.attr('style', align + 'width:'+this.getTextWidth(name,font)+'px'); + }, + getTextWidth: function(text, font) { + (!this.canvas) && (this.canvas = document.createElement("canvas")); + var ctx = this.canvas.getContext('2d'); + ctx.font = font; + var w = Math.ceil(ctx.measureText(text).width); + return (w < 100) ? Math.ceil(w*1.3) : w; }, setUserName: function(name) { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 7370b21405..4aec0765b3 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -487,6 +487,7 @@ display: flex; justify-content: center; overflow: hidden; + padding: 4px 0px 2px 2px; } #title-doc-name { @@ -496,7 +497,6 @@ text-align: center; font-size: 12px; line-height: 24px; - margin: 2px 0; background-color: transparent; border: 0 none; cursor: default; @@ -506,7 +506,7 @@ box-shadow: 0 0 0 1px @highlight-header-button-hover; /*border:@highlight-header-button-hover-ie solid 1px; border:@highlight-header-button-hover solid 1px;*/ - border-radius: 3px; + border-radius: 1px; cursor: text; } From 1ddc70848d8bad5644a6baa9af3cdeb631b52ac7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 28 Apr 2022 21:36:08 +0300 Subject: [PATCH 07/11] Fix document title width --- apps/common/main/lib/view/Header.js | 26 ++++++++++++--------- apps/common/main/resources/less/header.less | 1 + 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index cca98e9c1b..64b6ef0d81 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -204,7 +204,7 @@ define([ } function onAppShowed(config) { - //config.isCrypted =true; //delete fore merge! + // config.isCrypted =true; //delete fore merge! if ( this.labelDocName ) { if ( config.isCrypted ) { this.labelDocName.before( @@ -212,7 +212,6 @@ define([ '' + ''); this.imgCrypted = this.labelDocName.parent().find('.crypted'); - this.titleAlign = 'left'; } if (!config.isEdit || !config.customization || !config.customization.compactHeader) { @@ -726,6 +725,7 @@ define([ 'focus': onFocusDocName.bind(this), 'blur': function (e) { me.imgCrypted && me.imgCrypted.attr('hidden', false); + label[0].selectionStart = label[0].selectionEnd = 0; if(!me.isSaveDocName) { me.withoutExt = false; me.setDocTile(me.documentCaption); @@ -757,22 +757,26 @@ define([ return (name.substring(idx) == this.fileExtention) ? name.substring(0, idx) : name ; }, + setDocTile: function(name){ if(name) this.labelDocName.val(name); else name = this.labelDocName.val(); - var font ="12.5px Arial, Helvetica, \"Helvetica Neue\", sans-serif"; - var align = (this.titleAlign)?'text-align: ' + this.titleAlign + '; margin-left: 1px; ':''; - this.labelDocName.attr('style', align + 'width:'+this.getTextWidth(name,font)+'px'); + var width = this.getTextWidth(name); + (width>=0) && this.labelDocName.width(width); }, - getTextWidth: function(text, font) { - (!this.canvas) && (this.canvas = document.createElement("canvas")); - var ctx = this.canvas.getContext('2d'); - ctx.font = font; - var w = Math.ceil(ctx.measureText(text).width); - return (w < 100) ? Math.ceil(w*1.3) : w; + getTextWidth: function(text) { + if (!this._testCanvas ) { + var font = (this.labelDocName.css('font-size') + ' ' + this.labelDocName.css('font-family')).trim(); + if (font) { + var canvas = document.createElement("canvas"); + this._testCanvas = canvas.getContext('2d'); + this._testCanvas.font = font; + } + } + return this._testCanvas ? this._testCanvas.measureText(text).width : -1; }, setUserName: function(name) { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 4aec0765b3..1f14efa773 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -497,6 +497,7 @@ text-align: center; font-size: 12px; line-height: 24px; + padding: 1px 5px; background-color: transparent; border: 0 none; cursor: default; From a8df71a54ca117010c255615e341eeaf71fdd4ea Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 29 Apr 2022 01:33:39 +0300 Subject: [PATCH 08/11] Fix rib-doc-name --- apps/common/main/lib/view/Header.js | 11 +++-------- apps/common/main/resources/less/header.less | 12 ++++++++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index 64b6ef0d81..a996a7f432 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -352,8 +352,8 @@ define([ var name = me.labelDocName.val(); if ( e.keyCode == Common.UI.Keys.RETURN ) { name = name.trim(); - me.isSaveDocName =true; if ( !_.isEmpty(name) && me.cutDocName(me.documentCaption) !== name ) { + me.isSaveDocName =true; if ( /[\t*\+:\"<>?|\\\\/]/gim.test(name) ) { _.defer(function() { Common.UI.error({ @@ -378,7 +378,6 @@ define([ } } else { - Common.NotificationCenter.trigger('edit:complete', me); } } else @@ -660,10 +659,6 @@ define([ this.isModified && (value += '*'); if ( this.labelDocName ) { this.setDocTile( value ); - // this.labelDocName.attr('size', value.length); - //this.setCanRename(this.options.canRename); - - //this.setCanRename(true); } return value; }, @@ -709,7 +704,6 @@ define([ setCanRename: function (rename) { //rename = true; //comment out for merge - var me = this; me.options.canRename = rename; if ( me.labelDocName ) { @@ -734,7 +728,8 @@ define([ 'paste': function (e) { setTimeout(function() { var name = me.cutDocName(me.labelDocName.val()); - me.setDocTile(name); }); + me.setDocTile(name); + }); } }); diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 1f14efa773..4675a325b9 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -94,6 +94,7 @@ flex-grow: 1; display: flex; justify-content: center; + padding: 4px 0px; } #rib-doc-name { @@ -102,13 +103,20 @@ overflow: hidden; min-width: 50px; text-align: center; - color: @text-toolbar-header-ie; color: @text-toolbar-header; background-color: transparent; border: 0 none; + padding: 1px 5px; cursor: default; - line-height: 32px; + line-height: 24px; + + &:hover,&:focus { + box-shadow: 0 0 0 1px @highlight-header-button-hover-ie; + box-shadow: 0 0 0 1px @highlight-header-button-hover; + border-radius: 1px; + cursor: text; + } } #rib-save-status { From 0c9179f8b534c95d2605264a0ec434071be389ba Mon Sep 17 00:00:00 2001 From: OVSharova Date: Fri, 29 Apr 2022 15:47:20 +0300 Subject: [PATCH 09/11] additional style for #rib-doc-name --- apps/common/main/resources/less/toolbar.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 2f90adc502..76a805ebc6 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -544,6 +544,10 @@ #rib-doc-name { color: @text-normal-ie; color: @text-normal; + &:hover,&:focus { + box-shadow: 0 0 0 1px @highlight-button-hover-ie; + box-shadow: 0 0 0 1px @highlight-button-hover; + } } &.editor-native-color { From bc0c5738b1d6eaef2a5e2dc45dd0111de526bcb7 Mon Sep 17 00:00:00 2001 From: OVSharova Date: Sun, 1 May 2022 19:51:49 +0300 Subject: [PATCH 10/11] fix bug left part --- apps/common/main/lib/view/Header.js | 6 +++++- apps/common/main/resources/less/toolbar.less | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index a996a7f432..dffd58f74c 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -759,7 +759,11 @@ define([ else name = this.labelDocName.val(); var width = this.getTextWidth(name); - (width>=0) && this.labelDocName.width(width); + if (width>=0) + { + this.labelDocName.width(width); + Common.NotificationCenter.trigger('window:resize'); + } }, getTextWidth: function(text) { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index 76a805ebc6..d476b50106 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -61,6 +61,8 @@ overflow: hidden; display: flex; + min-width: 150px; + > ul { padding: 4px 0 0; margin: 0; From 97d3628998f71efabe6c0dba7b231b1577918f7d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 5 May 2022 19:18:30 +0300 Subject: [PATCH 11/11] Fix rename in header in view/edit and compactHeader mode --- apps/common/main/lib/view/Header.js | 19 +++++++++++-------- apps/common/main/resources/less/header.less | 8 ++++++-- apps/common/main/resources/less/toolbar.less | 5 ++--- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/apps/common/main/lib/view/Header.js b/apps/common/main/lib/view/Header.js index dffd58f74c..ed500c209e 100644 --- a/apps/common/main/lib/view/Header.js +++ b/apps/common/main/lib/view/Header.js @@ -214,14 +214,21 @@ define([ this.imgCrypted = this.labelDocName.parent().find('.crypted'); } + var $parent = this.labelDocName.parent(); if (!config.isEdit || !config.customization || !config.customization.compactHeader) { - var $parent = this.labelDocName.parent(); var _left_width = $parent.position().left, _right_width = $parent.next().outerWidth(); if ( _left_width < _right_width ) - this.labelDocName.parent().css('padding-left', _right_width - _left_width); - else this.labelDocName.parent().css('padding-right', _left_width - _right_width); + $parent.css('padding-left', Math.max(2, _right_width - _left_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 name = this.labelDocName.val(); var width = this.getTextWidth(name); - if (width>=0) - { - this.labelDocName.width(width); - Common.NotificationCenter.trigger('window:resize'); - } + (width>=0) && this.labelDocName.width(width); }, getTextWidth: function(text) { diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less index 4675a325b9..aff75f7632 100644 --- a/apps/common/main/resources/less/header.less +++ b/apps/common/main/resources/less/header.less @@ -51,6 +51,8 @@ &.right { flex-grow: 1; + flex-shrink: 0; + overflow: hidden; } .status-label { @@ -94,7 +96,9 @@ flex-grow: 1; display: flex; justify-content: center; - padding: 4px 0px; + padding: 4px 2px; + overflow: hidden; + flex-shrink: 0; } #rib-doc-name { @@ -495,7 +499,7 @@ display: flex; justify-content: center; overflow: hidden; - padding: 4px 0px 2px 2px; + padding: 4px 2px; } #title-doc-name { diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index d476b50106..87c5615048 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -60,8 +60,7 @@ position: relative; overflow: hidden; display: flex; - - min-width: 150px; + flex-shrink: 1; > ul { padding: 4px 0 0; @@ -561,7 +560,7 @@ } &.style-skip-docname .toolbar { - #box-doc-name > label { + #box-doc-name > input { display: none; } }