From 062a890b20309eb42758b7d5ada4305e1c0101de Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:34:00 +0300 Subject: [PATCH 1/6] Fix Bug 49705 --- apps/common/main/lib/view/ListSettingsDialog.js | 2 +- apps/documenteditor/main/app/view/ListSettingsDialog.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 7ba0754a4..54a13d0b2 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -187,7 +187,7 @@ define([ '
', '
', '
', - '', + '', '', '
' diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 298881567..c35ab4b31 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -195,7 +195,7 @@ define([ '
', '
', '
', - '', + '', '', '
' From 98cb25211255bec74cdf09b0106fdb24ed1f1573 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:48:26 +0300 Subject: [PATCH 2/6] Fix combobox styles --- apps/common/main/resources/less/combobox.less | 27 ++++++++++++++++--- .../main/app/view/ChartTypeDialog.js | 4 +-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/apps/common/main/resources/less/combobox.less b/apps/common/main/resources/less/combobox.less index c2a7c5a8a..e44ea1f4d 100644 --- a/apps/common/main/resources/less/combobox.less +++ b/apps/common/main/resources/less/combobox.less @@ -68,16 +68,19 @@ } } - &.input-group-nr.open:not(.no-highlighted) { + &.input-group-nr.open { & > .form-control, & > .btn { - border-color: @border-control-focus-ie; - border-color: @border-control-focus; - .caret { transform: rotate(45deg); } } + + &:not(.no-highlighted) > .form-control, + &:not(.no-highlighted) > .btn { + border-color: @border-control-focus-ie; + border-color: @border-control-focus; + } } &.input-group-nr:not(.no-highlighted) > .form-control { @@ -87,6 +90,13 @@ border-color: @border-control-focus; } } + &.input-group-nr.no-highlighted > .form-control { + &:focus, + &:focus ~ button.dropdown-toggle { + border-color: @border-regular-control-ie; + border-color: @border-regular-control; + } + } li { a { @@ -173,4 +183,13 @@ border-color: @border-control-focus; } } + + &.input-group-nr { + & > .form-control, + & > .btn { + .caret { + transform: rotate(45deg); + } + } + } } diff --git a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js index 0fdeeef17..300bce505 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ChartTypeDialog.js @@ -193,7 +193,7 @@ define([ '
', '
', '
<%= value %>
', - '
', + '
', '
', '
' ].join('')) @@ -388,7 +388,7 @@ define([ template: _.template([ '', '', - '', + '', '' ].join('')) }); From 16cfc2cad13196a35548a803eb6e9cc57cff619e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 15:53:49 +0300 Subject: [PATCH 3/6] [DE] Fix Bug 49701 --- apps/documenteditor/main/app/view/ParagraphSettings.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index dcb530521..025dfbe4b 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -247,7 +247,9 @@ define([ this.numIndentsRight.on('change', this.onNumIndentsRightChange.bind(this)); this.numSpecialBy.on('change', this.onFirstLineChange.bind(this)); this.cmbSpecial.on('selected', _.bind(this.onSpecialSelect, this)); - + this.numIndentsLeft.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); + this.numIndentsRight.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); + this.numSpecialBy.on('inputleave', function(){ me.fireEvent('editcomplete', me);}); this.linkAdvanced = $markup.findById('#paragraph-advanced-link'); this.linkAdvanced.toggleClass('disabled', this._locked); @@ -379,7 +381,6 @@ define([ props.get_Ind().put_FirstLine(specialBy); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){ @@ -392,7 +393,6 @@ define([ props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left)); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, onNumIndentsRightChange: function(field, newValue, oldValue, eOpts){ @@ -401,7 +401,6 @@ define([ props.get_Ind().put_Right(Common.Utils.Metric.fnRecalcToMM(field.getNumberValue())); if (this.api) this.api.paraApply(props); - this.fireEvent('editcomplete', this); }, ChangeSettings: function(prop) { From 974873a8ed1e280c2b6ddf0cdfd45a8057404531 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 17:01:48 +0300 Subject: [PATCH 4/6] [DE] Fix Bug 49732 --- apps/documenteditor/main/app/controller/Main.js | 6 ++++-- apps/documenteditor/main/locale/en.json | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c4d1c8a01..96f6202c9 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -141,7 +141,8 @@ define([ "Choose an item": this.txtChoose, "Enter a date": this.txtEnterDate, "Type equation here": this.txtTypeEquation, - "Click to load image": this.txtClickToLoad + "Click to load image": this.txtClickToLoad, + "No table of figures entries found.": this.txtNoTableOfFigures }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -2836,7 +2837,8 @@ define([ textLongName: 'Enter a name that is less than 128 characters.', textGuest: 'Guest', errorSubmit: 'Submit failed.', - txtClickToLoad: 'Click to load image' + txtClickToLoad: 'Click to load image', + txtNoTableOfFigures: "No table of figures entries found." } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index d8a7e29a6..48c156baf 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -613,6 +613,7 @@ "DE.Controllers.Main.txtMissOperator": "Missing Operator", "DE.Controllers.Main.txtNeedSynchronize": "You have updates", "DE.Controllers.Main.txtNoTableOfContents": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.", + "DE.Controllers.Main.txtNoTableOfFigures": "No table of figures entries found.", "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.", "DE.Controllers.Main.txtNotInTable": "Is Not In Table", "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.", From 784909d517e17b483db8f06e6f8d6005bd1adc13 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Apr 2021 19:05:34 +0300 Subject: [PATCH 5/6] [DE] Fix Bug 49695, Fix Bug 49694 --- .../main/app/view/ParagraphSettings.js | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/ParagraphSettings.js b/apps/documenteditor/main/app/view/ParagraphSettings.js index 025dfbe4b..56dbef023 100644 --- a/apps/documenteditor/main/app/view/ParagraphSettings.js +++ b/apps/documenteditor/main/app/view/ParagraphSettings.js @@ -365,6 +365,13 @@ define([ var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); props.get_Ind().put_FirstLine(specialBy); + if (specialBy<0 || this._state.FirstLine<0) { + var left = this._state.LeftIndent; + if (left !== undefined && left !== null) { + props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left); + } + } + if (this.api) this.api.paraApply(props); this.fireEvent('editcomplete', this); @@ -379,18 +386,25 @@ define([ var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); props.get_Ind().put_FirstLine(specialBy); + if (specialBy<0 || this._state.FirstLine<0) { + var left = this._state.LeftIndent; + if (left !== undefined && left !== null) { + props.get_Ind().put_Left(specialBy<0 ? left-specialBy : left); + } + } + if (this.api) this.api.paraApply(props); }, onNumIndentsLeftChange: function(field, newValue, oldValue, eOpts){ - var left = field.getNumberValue(); + var left = Common.Utils.Metric.fnRecalcToMM(field.getNumberValue()); if (this._state.FirstLine<0) { left = left-this._state.FirstLine; } var props = new Asc.asc_CParagraphProperty(); props.put_Ind(new Asc.asc_CParagraphInd()); - props.get_Ind().put_Left(Common.Utils.Metric.fnRecalcToMM(left)); + props.get_Ind().put_Left(left); if (this.api) this.api.paraApply(props); }, @@ -538,7 +552,10 @@ define([ for (var i=0; i Date: Mon, 19 Apr 2021 20:11:09 +0300 Subject: [PATCH 6/6] [SSE mobile] Fix Bug 49728 --- apps/spreadsheeteditor/mobile/app/controller/Main.js | 8 +++++++- apps/spreadsheeteditor/mobile/locale/en.json | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 1c6d2d289..07f75cbf8 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1147,6 +1147,10 @@ define([ config.msg = errData && errData.asc_getError() ? Common.Utils.String.htmlEncode(errData.asc_getError()) : this.errorDataValidate; break; + case Asc.c_oAscError.ID.LockedCellPivot: + config.msg = this.errorLockedCellPivot; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1188,6 +1192,7 @@ define([ config.buttons = [{ text: 'OK' }, { text: this.textCancel, onClick: config.callback }]; } else { config.buttons = [{ text: 'OK', onClick: config.callback }]; + $('#ce-cell-content').blur(); } uiApp.modal({ title : config.title, @@ -1789,7 +1794,8 @@ define([ warnLicenseLimitedRenewed: 'License needs to be renewed.
You have a limited access to document editing functionality.
Please contact your administrator to get full access', warnLicenseLimitedNoAccess: 'License expired.
You have no access to document editing functionality.
Please contact your administrator.', textGuest: 'Guest', - errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.' + errorDataValidate: 'The value you entered is not valid.
A user has restricted values that can be entered into this cell.', + errorLockedCellPivot: 'You cannot change data inside a pivot table.' } })(), SSE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index fe0e79487..3371d3249 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -214,6 +214,8 @@ "SSE.Controllers.Main.errorViewerDisconnect": "Connection is lost. You can still view the document,
but will not be able to download it until the connection is restored and page is reloaded.", "SSE.Controllers.Main.errorWrongBracketsCount": "An error in the entered formula.
Wrong number of brackets is used.", "SSE.Controllers.Main.errorWrongOperator": "An error in the entered formula. Wrong operator is used.
Please correct the error.", + "SSE.Controllers.Main.errorDataValidate": "The value you entered is not valid.
A user has restricted values that can be entered into this cell.", + "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to await the autosave of the document. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", "SSE.Controllers.Main.loadFontsTitleText": "Loading Data",