From 4f956a6c230726954d090a49deb27287c2321149 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 02:36:21 +0300 Subject: [PATCH 01/22] Fix Bug 49342 --- apps/documenteditor/mobile/locale/backup/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/locale/backup/ru.json b/apps/documenteditor/mobile/locale/backup/ru.json index f4e1308903..fe0a9e90be 100644 --- a/apps/documenteditor/mobile/locale/backup/ru.json +++ b/apps/documenteditor/mobile/locale/backup/ru.json @@ -106,7 +106,7 @@ "DE.Controllers.DocumentHolder.menuSplit": "Разделить ячейку", "DE.Controllers.DocumentHolder.sheetCancel": "Отмена", "DE.Controllers.DocumentHolder.textCancel": "Отмена", - "DE.Controllers.DocumentHolder.textColumns": "Колонки", + "DE.Controllers.DocumentHolder.textColumns": "Столбцы", "DE.Controllers.DocumentHolder.textCopyCutPasteActions": "Операции копирования, вырезания и вставки", "DE.Controllers.DocumentHolder.textDoNotShowAgain": "Больше не показывать", "DE.Controllers.DocumentHolder.textGuest": "Гость", From 6067e344a257ad210601c9286d2e8928777377cc Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 02:45:16 +0300 Subject: [PATCH 02/22] Fix Bug 49540 --- apps/documenteditor/mobile/locale/backup/ru.json | 2 +- apps/spreadsheeteditor/mobile/locale/ru.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/locale/backup/ru.json b/apps/documenteditor/mobile/locale/backup/ru.json index fe0a9e90be..380cefb708 100644 --- a/apps/documenteditor/mobile/locale/backup/ru.json +++ b/apps/documenteditor/mobile/locale/backup/ru.json @@ -394,7 +394,7 @@ "DE.Views.EditShape.textFromText": "Расстояние до текста", "DE.Views.EditShape.textInFront": "Перед текстом", "DE.Views.EditShape.textInline": "В тексте", - "DE.Views.EditShape.textOpacity": "Прозрачность", + "DE.Views.EditShape.textOpacity": "Непрозрачность", "DE.Views.EditShape.textOverlap": "Разрешить перекрытие", "DE.Views.EditShape.textRemoveShape": "Удалить фигуру", "DE.Views.EditShape.textReorder": "Порядок", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 05a06bf8b0..25f315c1f1 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -551,7 +551,7 @@ "SSE.Views.EditShape.textEffects": "Эффекты", "SSE.Views.EditShape.textFill": "Заливка", "SSE.Views.EditShape.textForward": "Перенести вперед", - "SSE.Views.EditShape.textOpacity": "Прозрачность", + "SSE.Views.EditShape.textOpacity": "Непрозрачность", "SSE.Views.EditShape.textRemoveShape": "Удалить фигуру", "SSE.Views.EditShape.textReorder": "Порядок", "SSE.Views.EditShape.textReplace": "Заменить", From a5a70b05d0795d42d5c0a5376ad08e0acccbf53a Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Sat, 17 Jul 2021 16:54:49 +0300 Subject: [PATCH 03/22] Fix Bug 51169 --- apps/common/mobile/resources/less/common.less | 81 ++++++++++--------- 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 1371c75b23..9b9d9ee482 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -383,47 +383,54 @@ } } -.color-palettes { - .palette { - padding: 8px 0px; - a { - flex-grow: 1; - position: relative; - min-width: 10px; - min-height: 26px; - margin: 1px 1px 0 0; - box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; - &.active:after { - content: ' '; - position: absolute; - width: 100%; - height: 100%; - box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; - z-index: 1; - border-radius: 1px; - } - &.transparent { - background-repeat: no-repeat; - background-size: 100% 100%; - .encoded-svg-background(""); +.page { + .color-palettes { + .list { + .palette { + padding: 8px 0px; + .row { + a { + flex-grow: 1; + position: relative; + min-width: 10px; + min-height: 26px; + margin: 1px 1px 0 0; + box-shadow: 0 0 0 1px rgba(0, 0, 0, .15) inset; + border-radius: 0; + &.active:after { + content: ' '; + position: absolute; + width: 100%; + height: 100%; + box-shadow: 0 0 0 1px @white, 0 0 0 4px @themeColor; + z-index: 1; + border-radius: 1px; + } + &.transparent { + background-repeat: no-repeat; + background-size: 100% 100%; + .encoded-svg-background(""); + } + } + } } } - } - .row { - padding: 0; - } - .list .item-inner { - display: block; - } - .standart-colors, .dynamic-colors { - .palette { - display: flex; + .row { + padding: 0; + } + .list .item-inner { + display: block; + } + .standart-colors, .dynamic-colors { + .palette { + display: flex; + } } - } - .dynamic-colors { - .empty-color { - background-color: @white; + .dynamic-colors { + .empty-color { + background-color: @white; + } } } } From 630799d928f843fcba3a13234fcd691ba70fbc75 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Jul 2021 13:42:03 +0300 Subject: [PATCH 04/22] [DE] Add parameter customization->review->hideReviewDisplay for hiding display mode button --- apps/api/documents/api.js | 3 +++ apps/common/main/lib/view/ReviewChanges.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index e6868323ed..2aa7ad0029 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -135,6 +135,9 @@ request: bool (default: true), // enable set name label: string (default: "Guest") // postfix for user name }, + review: { + hideReviewDisplay: false // hide button Review mode + }, chat: true, comments: true, zoom: 100, diff --git a/apps/common/main/lib/view/ReviewChanges.js b/apps/common/main/lib/view/ReviewChanges.js index 6463da2322..0b52de0d99 100644 --- a/apps/common/main/lib/view/ReviewChanges.js +++ b/apps/common/main/lib/view/ReviewChanges.js @@ -277,7 +277,7 @@ define([ caption: this.txtNext }); - if (!this.appConfig.isRestrictedEdit) {// hide Display mode option for fillForms and commenting mode + if (!this.appConfig.isRestrictedEdit && !(this.appConfig.customization && this.appConfig.customization.review && this.appConfig.customization.review.hideReviewDisplay)) {// hide Display mode option for fillForms and commenting mode var menuTemplate = _.template('
<%= caption %>
' + '<% if (options.description !== null) { %>' + '<% } %>'); From a5d2df5a7d7a032826bf5f4a2c0ace09227da261 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 19 Jul 2021 13:56:51 +0300 Subject: [PATCH 05/22] [SSE mobile] Fix Bug 51180 --- apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx index 8db15a70a0..09cb1048ff 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/Toolbar.jsx @@ -53,7 +53,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn const api = Common.EditorApi.get(); api.asc_unregisterCallback('asc_onCanUndoChanged', onApiCanUndo); api.asc_unregisterCallback('asc_onCanRedoChanged', onApiCanRedo); - //api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO + // api.asc_unregisterCallback('asc_onSelectionChanged', onApiSelectionChanged); TO DO api.asc_unregisterCallback('asc_onWorkbookLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onWorksheetLocked', onApiSelectionChanged); api.asc_unregisterCallback('asc_onActiveSheetChanged', onApiActiveSheetChanged); @@ -137,7 +137,7 @@ const ToolbarController = inject('storeAppOptions', 'users', 'storeSpreadsheetIn if (isDisconnected) return; const api = Common.EditorApi.get(); - const info = !!cellInfo ? cellInfo : api.asc_getCellInfo(); + const info = cellInfo && typeof cellInfo === 'object' ? cellInfo : api.asc_getCellInfo(); let islocked = false; switch (info.asc_getSelectionType()) { From 4177faa7eea1bb91127c00f99912e679fe15df29 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 19 Jul 2021 14:06:01 +0300 Subject: [PATCH 06/22] [DE] Support events for change review display mode --- apps/common/main/lib/controller/ReviewChanges.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 28b169af61..b9c7ac6b26 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -131,6 +131,8 @@ define([ this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this)); this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this)); + this.api.asc_registerCallback('asc_onBeginViewModeInReview', _.bind(this.onBeginViewModeInReview, this)); + this.api.asc_registerCallback('asc_onEndViewModeInReview', _.bind(this.onEndViewModeInReview, this)); } if (this.appConfig.canReview) this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this)); @@ -694,6 +696,18 @@ define([ this._state.previewMode = (mode == 'final' || mode == 'original'); }, + onBeginViewModeInReview: function(mode) { + this.disableEditing(true); + this.view && this.view.turnDisplayMode(mode ? 'final' : 'original'); + this._state.previewMode = true; + }, + + onEndViewModeInReview: function() { + this.disableEditing(false); + this.view && this.view.turnDisplayMode('markup'); + this._state.previewMode = false; + }, + isPreviewChangesMode: function() { return this._state.previewMode; }, From f9b7e162b318051f2db2ecde259a0a2832215b36 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 19 Jul 2021 18:09:34 +0300 Subject: [PATCH 07/22] [common] fix bug 50727 --- apps/common/main/resources/less/buttons.less | 2 ++ apps/common/main/resources/less/colors-table-classic.less | 2 +- apps/common/main/resources/less/combo-dataview.less | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less index fab2c637b0..c875354fc2 100644 --- a/apps/common/main/resources/less/buttons.less +++ b/apps/common/main/resources/less/buttons.less @@ -677,6 +677,7 @@ &:active:not(.disabled), &.active:not(.disabled) { .caret { + border-color: @icon-normal; } } } @@ -978,6 +979,7 @@ &.active:not(.disabled) { .caret { background-position: @arrow-small-offset-x @arrow-small-offset-y; + border-color: @icon-normal; } } diff --git a/apps/common/main/resources/less/colors-table-classic.less b/apps/common/main/resources/less/colors-table-classic.less index efa5c9a63f..33f7e75bcd 100644 --- a/apps/common/main/resources/less/colors-table-classic.less +++ b/apps/common/main/resources/less/colors-table-classic.less @@ -47,7 +47,7 @@ --text-contrast-background: #fff; --icon-normal: #444; - --icon-normal-pressed: #444; + --icon-normal-pressed: #fff; --icon-inverse: #444; --icon-toolbar-header: fade(#fff, 80%); --icon-notification-badge: #000; diff --git a/apps/common/main/resources/less/combo-dataview.less b/apps/common/main/resources/less/combo-dataview.less index 64b972abc0..11a8aff529 100644 --- a/apps/common/main/resources/less/combo-dataview.less +++ b/apps/common/main/resources/less/combo-dataview.less @@ -48,6 +48,12 @@ } } } + + &.active, &:active { + .caret { + border-color: @icon-normal; + } + } } } From d75eb80c4d382f4ff4b928a679a65e36b8ef2276 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 19 Jul 2021 19:48:11 +0300 Subject: [PATCH 08/22] [PE mobile] Fix Bug 51377 --- apps/presentationeditor/mobile/locale/en.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 4989a84afc..4e78ef5524 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -374,7 +374,9 @@ "textZoom": "Zoom", "textZoomIn": "Zoom In", "textZoomOut": "Zoom Out", - "textZoomRotate": "Zoom and Rotate" + "textZoomRotate": "Zoom and Rotate", + "textBullets": "Bullets", + "textNumbers": "Numbers" }, "Settings": { "mniSlideStandard": "Standard (4:3)", From 5117ed8834e78c4f036d3896c7a8d981262e1a83 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Mon, 19 Jul 2021 19:54:51 +0300 Subject: [PATCH 09/22] [DE mobile] Fix Bug 51378 --- apps/documenteditor/mobile/locale/en.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 2c38f5860b..5baddb1323 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -293,7 +293,9 @@ "textTopAndBottom": "Top and Bottom", "textTotalRow": "Total Row", "textType": "Type", - "textWrap": "Wrap" + "textWrap": "Wrap", + "textBullets": "Bullets", + "textNumbers": "Numbers" }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", From f864b6d719b8ce750342e889513b046fccaaff6c Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Mon, 19 Jul 2021 23:06:36 +0300 Subject: [PATCH 10/22] [all mobile] fixed logo --- apps/common/mobile/resources/img/about/logo.svg | 1 - apps/common/mobile/resources/less/about.less | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 apps/common/mobile/resources/img/about/logo.svg diff --git a/apps/common/mobile/resources/img/about/logo.svg b/apps/common/mobile/resources/img/about/logo.svg deleted file mode 100644 index 6541262b52..0000000000 --- a/apps/common/mobile/resources/img/about/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 7234dcb254..8e42bf1ddc 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -36,6 +36,7 @@ display: inline-block; width: 100%; height: 55px; - background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; + //background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; + background: url('../../../../common/main/resources/img/about/logo_s.svg') no-repeat center; } } \ No newline at end of file From e949655e8ea073ae782f068f9fff2a0e28308edd Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Tue, 20 Jul 2021 00:11:44 +0300 Subject: [PATCH 11/22] Update about.less --- apps/common/mobile/resources/less/about.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/common/mobile/resources/less/about.less b/apps/common/mobile/resources/less/about.less index 8e42bf1ddc..8a75595307 100644 --- a/apps/common/mobile/resources/less/about.less +++ b/apps/common/mobile/resources/less/about.less @@ -36,7 +36,6 @@ display: inline-block; width: 100%; height: 55px; - //background: url('../../../../common/mobile/resources/img/about/logo.svg') no-repeat center; background: url('../../../../common/main/resources/img/about/logo_s.svg') no-repeat center; } -} \ No newline at end of file +} From a53b3dfdcb26a8b6a96642d7bb8ba0a23a34082a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jul 2021 16:24:05 +0300 Subject: [PATCH 12/22] [SSE] For bug 51398 --- apps/spreadsheeteditor/main/app/controller/Main.js | 12 +++++++++++- apps/spreadsheeteditor/main/locale/en.json | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 347b68ff71..f0cea524ef 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1692,6 +1692,14 @@ define([ config.msg = this.errorPivotWithoutUnderlying; break; + case Asc.c_oAscError.ID.SingleColumnOrRowError: + config.msg = this.errorSingleColumnOrRowError; + break; + + case Asc.c_oAscError.ID.LocationOrDataRangeError: + config.msg = this.errorLocationOrDataRangeError; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2965,7 +2973,9 @@ define([ txtQuarter: 'Qtr', txtOr: '%1 or %2', errorLang: 'The interface language is not loaded.
Please contact your Document Server administrator.', - confirmReplaceFormulaInTable: 'Formulas in the header row will be removed and converted to static text.
Do you want to continue?' + confirmReplaceFormulaInTable: 'Formulas in the header row will be removed and converted to static text.
Do you want to continue?', + errorSingleColumnOrRowError: 'Location reference is not valid because the cells are not all in the same column or row.
Select cells that are all in a single column or row.', + errorLocationOrDataRangeError: 'The reference for the location or data range is not valid.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index c4b9ea495a..7d96a150e0 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -685,6 +685,8 @@ "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.errRemDuplicates": "Duplicate values found and deleted: {0}, unique values left: {1}.", + "SSE.Controllers.Main.errorSingleColumnOrRowError": "Location reference is not valid because the cells are not all in the same column or row.
Select cells that are all in a single column or row.", + "SSE.Controllers.Main.errorLocationOrDataRangeError": "The reference for the location or data range is not valid.", "SSE.Controllers.Main.leavePageText": "You have unsaved changes in this spreadsheet. Click 'Stay on this Page' then 'Save' to save them. Click 'Leave this Page' to discard all the unsaved changes.", "SSE.Controllers.Main.leavePageTextOnClose": "All unsaved changes in this spreadsheet will be lost.
Click \"Cancel\" then \"Save\" to save them. Click \"OK\" to discard all the unsaved changes.", "SSE.Controllers.Main.loadFontsTextText": "Loading data...", @@ -1920,6 +1922,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.txtCondFormat": "Conditional Formatting", "SSE.Views.FieldSettingsDialog.strLayout": "Layout", "SSE.Views.FieldSettingsDialog.strSubtotals": "Subtotals", "SSE.Views.FieldSettingsDialog.textReport": "Report Form", From 1b163e8dbe9a3bdb2ac81d67a387a65799b90c83 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jul 2021 17:17:45 +0300 Subject: [PATCH 13/22] Fix translation --- apps/documenteditor/mobile/locale/en.json | 66 +++++++++++++++++-- apps/presentationeditor/mobile/locale/en.json | 28 +++++++- apps/spreadsheeteditor/mobile/locale/en.json | 65 +++++++++++++++++- 3 files changed, 151 insertions(+), 8 deletions(-) diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 2c38f5860b..96b2169088 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -205,6 +205,7 @@ "textBehind": "Behind", "textBorder": "Border", "textBringToForeground": "Bring to foreground", + "textBullets": "Bullets", "textBulletsAndNumbers": "Bullets & Numbers", "textCellMargins": "Cell Margins", "textChart": "Chart", @@ -250,6 +251,7 @@ "textNone": "None", "textNoStyles": "No styles for this type of charts.", "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "textNumbers": "Numbers", "textOpacity": "Opacity", "textOptions": "Options", "textOrphanControl": "Orphan Control", @@ -297,7 +299,7 @@ }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", - "criticalErrorExtText": "Press 'OK' to back to the document list.", + "criticalErrorExtText": "Press 'OK' to go back to the document list.", "criticalErrorTitle": "Error", "downloadErrorText": "Download failed.", "errorAccessDeny": "You are trying to perform an action you do not have rights for.
Please, contact your admin.", @@ -379,7 +381,22 @@ "leavePageText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", "notcriticalErrorTitle": "Warning", "SDK": { + " -Section ": " -Section ", + "above": "above", + "below": "below", + "Caption": "Caption", + "Choose an item": "Choose an item", + "Click to load image": "Click to load image", + "Current Document": "Current Document", "Diagram Title": "Chart Title", + "endnote text": "Endnote Text", + "Enter a date": "Enter a date", + "Error! Bookmark not defined": "Error! Bookmark not defined.", + "Error! Main Document Only": "Error! Main Document Only.", + "Error! No text of specified style in document": "Error! No text of specified style in document.", + "Error! Not a valid bookmark self-reference": "Error! Not a valid bookmark self-reference.", + "Even Page ": "Even Page ", + "First Page ": "First Page ", "Footer": "Footer", "footnote text": "Footnote Text", "Header": "Header", @@ -392,17 +409,38 @@ "Heading 7": "Heading 7", "Heading 8": "Heading 8", "Heading 9": "Heading 9", + "Hyperlink": "Hyperlink", + "Index Too Large": "Index Too Large", "Intense Quote": "Intense Quote", + "Is Not In Table": "Is Not In Table", "List Paragraph": "List Paragraph", + "Missing Argument": "Missing Argument", + "Missing Operator": "Missing Operator", "No Spacing": "No Spacing", + "No table of contents entries found": "There are no headings in the document. Apply a heading style to the text so that it appears in the table of contents.", + "No table of figures entries found": "No table of figures entries found.", + "None": "None", "Normal": "Normal", + "Number Too Large To Format": "Number Too Large To Format", + "Odd Page ": "Odd Page ", "Quote": "Quote", + "Same as Previous": "Same as Previous", "Series": "Series", "Subtitle": "Subtitle", + "Syntax Error": "Syntax Error", + "Table Index Cannot be Zero": "Table Index Cannot be Zero", + "Table of Contents": "Table of Contents", + "table of figures": "Table of figures", + "The Formula Not In Table": "The Formula Not In Table", "Title": "Title", + "TOC Heading": "TOC Heading", + "Type equation here": "Type equation here", + "Undefined Bookmark": "Undefined Bookmark", + "Unexpected End of Formula": "Unexpected End of Formula", "X Axis": "X Axis XAS", "Y Axis": "Y Axis", - "Your text here": "Your text here" + "Your text here": "Your text here", + "Zero Divide": "Zero Divide" }, "textAnonymous": "Anonymous", "textBuyNow": "Visit website", @@ -481,7 +519,7 @@ "textMacrosSettings": "Macros Settings", "textMargins": "Margins", "textMarginsH": "Top and bottom margins are too high for a given page height", - "textMarginsW": "Left and right margins are too high for a given page width", + "textMarginsW": "Left and right margins are too wide for a given page width", "textNoCharacters": "Nonprinting Characters", "textNoTextFound": "Text not found", "textOpenFile": "Enter a password to open the file", @@ -506,7 +544,27 @@ "textUnitOfMeasurement": "Unit Of Measurement", "textUploaded": "Uploaded", "txtIncorrectPwd": "Password is incorrect", - "txtProtected": "Once you enter the password and open the file, the current password will be reset" + "txtProtected": "Once you enter the password and open the file, the current password will be reset", + "txtScheme1": "Office", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme2": "Grayscale", + "txtScheme22": "New Office", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry" }, "Toolbar": { "dlgLeaveMsgText": "You have unsaved changes. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.", diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 4989a84afc..ee4cb03db3 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -71,6 +71,8 @@ "notcriticalErrorTitle": "Warning", "SDK": { "Chart": "Chart", + "Click to add first slide": "Click to add first slide", + "Click to add notes": "Click to add notes", "ClipArt": "Clip Art", "Date and time": "Date and time", "Diagram": "Diagram", @@ -78,7 +80,9 @@ "Footer": "Footer", "Header": "Header", "Image": "Image", + "Loading": "Loading", "Media": "Media", + "None": "None", "Picture": "Picture", "Series": "Series", "Slide number": "Slide number", @@ -258,6 +262,7 @@ "textBottomLeft": "Bottom-Left", "textBottomRight": "Bottom-Right", "textBringToForeground": "Bring to Foreground", + "textBullets": "Bullets", "textBulletsAndNumbers": "Bullets & Numbers", "textCaseSensitive": "Case Sensitive", "textCellMargins": "Cell Margins", @@ -321,6 +326,7 @@ "textNoStyles": "No styles for this type of chart.", "textNoTextFound": "Text not found", "textNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "textNumbers": "Numbers", "textOpacity": "Opacity", "textOptions": "Options", "textPictureFromLibrary": "Picture from Library", @@ -431,7 +437,27 @@ "textTitle": "Title", "textUnitOfMeasurement": "Unit Of Measurement", "textUploaded": "Uploaded", - "textVersion": "Version" + "textVersion": "Version", + "txtScheme1": "Office", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme2": "Grayscale", + "txtScheme22": "New Office", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry" } } } \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index c3f3e706d5..a3ad6925fa 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -73,8 +73,35 @@ "notcriticalErrorTitle": "Warning", "SDK": { "txtAccent": "Accent", + "txtAll": "(All)", "txtArt": "Your text here", + "txtBlank": "(blank)", + "txtByField": "%1 of %2", + "txtClearFilter": "Clear Filter (Alt+C)", + "txtColLbls": "Column Labels", + "txtColumn": "Column", + "txtConfidential": "Confidential", + "txtDate": "Date", + "txtDays": "Days", "txtDiagramTitle": "Chart Title", + "txtFile": "File", + "txtGrandTotal": "Grand Total", + "txtGroup": "Group", + "txtHours": "Hours", + "txtMinutes": "Minutes", + "txtMonths": "Months", + "txtMultiSelect": "Multi-Select (Alt+S)", + "txtOr": "%1 or %2", + "txtPage": "Page", + "txtPageOf": "Page %1 of %2", + "txtPages": "Pages", + "txtPreparedBy": "Prepared by", + "txtPrintArea": "Print_Area", + "txtQuarter": "Qtr", + "txtQuarters": "Quarters", + "txtRow": "Row", + "txtRowLbls": "Row Labels", + "txtSeconds": "Seconds", "txtSeries": "Series", "txtStyle_Bad": "Bad", "txtStyle_Calculation": "Calculation", @@ -97,8 +124,13 @@ "txtStyle_Title": "Title", "txtStyle_Total": "Total", "txtStyle_Warning_Text": "Warning Text", + "txtTab": "Tab", + "txtTable": "Table", + "txtTime": "Time", + "txtValues": "Values", "txtXAxis": "X Axis", - "txtYAxis": "Y Axis" + "txtYAxis": "Y Axis", + "txtYears": "Years" }, "textAnonymous": "Anonymous", "textBuyNow": "Visit website", @@ -270,6 +302,7 @@ "textAddLink": "Add Link", "textAddress": "Address", "textBack": "Back", + "textCancel": "Cancel", "textChart": "Chart", "textComment": "Comment", "textDisplay": "Display", @@ -296,7 +329,11 @@ "textShape": "Shape", "textSheet": "Sheet", "textSortAndFilter": "Sort and Filter", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"" + "txtExpand": "Expand and sort", + "txtExpandSort": "The data next to the selection will not be sorted. Do you want to expand the selection to include the adjacent data or continue with sorting the currently selected cells only?", + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "txtSorting": "Sorting", + "txtSortSelected": "Sort selected" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -474,7 +511,9 @@ "textVerticalText": "Vertical Text", "textWrapText": "Wrap Text", "textYen": "Yen", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"" + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "txtSortHigh2Low": "Sort Highest to Lowest", + "txtSortLow2High": "Sort Lowest to Highest" }, "Settings": { "advCSVOptions": "Choose CSV options", @@ -568,6 +607,26 @@ "txtEncoding": "Encoding", "txtIncorrectPwd": "Password is incorrect", "txtProtected": "Once you enter the password and open the file, the current password to the file will be reset", + "txtScheme1": "Office", + "txtScheme10": "Median", + "txtScheme11": "Metro", + "txtScheme12": "Module", + "txtScheme13": "Opulent", + "txtScheme14": "Oriel", + "txtScheme15": "Origin", + "txtScheme16": "Paper", + "txtScheme17": "Solstice", + "txtScheme18": "Technic", + "txtScheme19": "Trek", + "txtScheme2": "Grayscale", + "txtScheme22": "New Office", + "txtScheme3": "Apex", + "txtScheme4": "Aspect", + "txtScheme5": "Civic", + "txtScheme6": "Concourse", + "txtScheme7": "Equity", + "txtScheme8": "Flow", + "txtScheme9": "Foundry", "txtSpace": "Space", "txtTab": "Tab", "warnDownloadAs": "If you continue saving in this format all features except the text will be lost.
Are you sure you want to continue?" From 24f74aa1999c7f6fa811e5cbf65452687b0119a8 Mon Sep 17 00:00:00 2001 From: SergeyEzhin Date: Tue, 20 Jul 2021 18:30:21 +0300 Subject: [PATCH 14/22] Fix Bug 51402 --- apps/common/mobile/resources/less/common.less | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/common/mobile/resources/less/common.less b/apps/common/mobile/resources/less/common.less index 9b9d9ee482..fd53af7de5 100644 --- a/apps/common/mobile/resources/less/common.less +++ b/apps/common/mobile/resources/less/common.less @@ -386,9 +386,9 @@ .page { .color-palettes { .list { - .palette { - padding: 8px 0px; - .row { + ul { + .palette { + padding: 8px 0px; a { flex-grow: 1; position: relative; @@ -411,7 +411,7 @@ background-size: 100% 100%; .encoded-svg-background(""); } - } + } } } } From 48c200d64123d2697c7553a2a378e116d5be3f2b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jul 2021 18:43:04 +0300 Subject: [PATCH 15/22] [SSE] Fix Bug 51418 --- apps/spreadsheeteditor/main/app/controller/DataTab.js | 4 +++- apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DataTab.js b/apps/spreadsheeteditor/main/app/controller/DataTab.js index 486cffcb8b..bc2c3bbb29 100644 --- a/apps/spreadsheeteditor/main/app/controller/DataTab.js +++ b/apps/spreadsheeteditor/main/app/controller/DataTab.js @@ -226,6 +226,7 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.toolbar); } else if (type === 'url') { (new Common.Views.ImageFromUrlDialog({ + title: me.txtUrlTitle, handler: function(result, value) { if (result == 'ok') { if (me.api) { @@ -426,7 +427,8 @@ define([ txtExtendDataValidation: 'The selection contains some cells without Data Validation settings.
Do you want to extend Data Validation to these cells?', txtRemoveDataValidation: 'The selection contains more than one type of validation.
Erase current settings and continue?', textEmptyUrl: 'You need to specify URL.', - txtImportWizard: 'Text Import Wizard' + txtImportWizard: 'Text Import Wizard', + txtUrlTitle: 'Paste a data URL' }, SSE.Controllers.DataTab || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 7d96a150e0..546ea1b1cb 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -417,6 +417,7 @@ "SSE.Controllers.DataTab.txtRemDuplicates": "Remove Duplicates", "SSE.Controllers.DataTab.txtRemoveDataValidation": "The selection contains more than one type of validation.
Erase current settings and continue?", "SSE.Controllers.DataTab.txtRemSelected": "Remove in selected", + "SSE.Controllers.DataTab.txtUrlTitle": "Paste a data URL", "SSE.Controllers.DocumentHolder.alignmentText": "Alignment", "SSE.Controllers.DocumentHolder.centerText": "Center", "SSE.Controllers.DocumentHolder.deleteColumnText": "Delete Column", From b5b8dca3a6cd01c5f9f02cdb4e9f01ce3b293d31 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Jul 2021 19:45:24 +0300 Subject: [PATCH 16/22] [all mobile] added version info in production js --- build/Gruntfile.js | 69 ++++++++++++------------- build/documenteditor.json | 94 +---------------------------------- build/presentationeditor.json | 94 +---------------------------------- build/spreadsheeteditor.json | 94 +---------------------------------- 4 files changed, 38 insertions(+), 313 deletions(-) diff --git a/build/Gruntfile.js b/build/Gruntfile.js index df942b6329..adff92d5e8 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -4,7 +4,7 @@ module.exports = function(grunt) { packageFile; const copyrightHeader = 'Copyright (c) Ascensio System SIA <%= grunt.template.today("yyyy") %>. All rights reserved' - var copyright = '/*\n' + + var copyright = '/*!\n' + ' * ' + (process.env['APP_COPYRIGHT'] || copyrightHeader) + '\n' + ' *\n' + ' * <%= pkg.homepage %> \n' + @@ -432,11 +432,6 @@ module.exports = function(grunt) { 'template-backup': packageFile.mobile.copy['template-backup'][0].dest }, - requirejs: { - compile: { - options: packageFile['mobile']['js']['requirejs']['options'] - } - }, concat: { options: { @@ -444,8 +439,8 @@ module.exports = function(grunt) { banner: copyright }, dist: { - src: packageFile.mobile.js.requirejs.options.out, - dest: packageFile.mobile.js.requirejs.options.out + src: packageFile.mobile.js.dest, + dest: packageFile.mobile.js.dest } }, @@ -498,29 +493,29 @@ module.exports = function(grunt) { }, }, - replace: { - writeVersion: { - src: ['<%= pkg.mobile.js.requirejs.options.out %>'], - overwrite: true, - replacements: [{ - from: /\{\{PRODUCT_VERSION\}\}/, - to: packageFile.version - }] - }, - fixResourceUrl: { - src: ['<%= pkg.mobile.js.requirejs.options.out %>', - '<%= pkg.mobile.css.ios.dist %>', - '<%= pkg.mobile.css.material.dist %>'], - overwrite: true, - replacements: [{ - from: /(?:\.{2}\/){4}common\/mobile\/resources\/img/g, - to: '../img' - },{ - from: /(?:\.{2}\/){2}common\/mobile/g, - to: '../mobile' - }] - } - }, + // replace: { + // writeVersion: { + // src: ['<%= pkg.mobile.js.requirejs.options.out %>'], + // overwrite: true, + // replacements: [{ + // from: /\{\{PRODUCT_VERSION\}\}/, + // to: packageFile.version + // }] + // }, + // fixResourceUrl: { + // src: ['<%= pkg.mobile.js.requirejs.options.out %>', + // '<%= pkg.mobile.css.ios.dist %>', + // '<%= pkg.mobile.css.material.dist %>'], + // overwrite: true, + // replacements: [{ + // from: /(?:\.{2}\/){4}common\/mobile\/resources\/img/g, + // to: '../img' + // },{ + // from: /(?:\.{2}\/){2}common\/mobile/g, + // to: '../mobile' + // }] + // } + // }, exec: { webpack_app_build: { @@ -542,9 +537,9 @@ module.exports = function(grunt) { } }); - var replace = grunt.config.get('replace'); - replace.writeVersion.replacements.push(...jsreplacements); - grunt.config.set('replace', replace); + // var replace = grunt.config.get('replace'); + // replace.writeVersion.replacements.push(...jsreplacements); + // grunt.config.set('replace', replace); }); grunt.registerTask('embed-app-init', function() { @@ -629,10 +624,10 @@ module.exports = function(grunt) { 'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']); grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', /*'cssmin',*/ /*'copy:template-backup',*/ - 'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'concat',*/ /*'copy:template-restore',*/ + 'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'copy:template-restore',*/ /*'clean:template-backup',*/ 'copy:localization', 'copy:index-page', - 'copy:images-app', 'copy:webpack-dist', 'json-minify', - 'replace:writeVersion', 'replace:fixResourceUrl']); + 'copy:images-app', 'copy:webpack-dist', 'concat', 'json-minify'/*,*/ + /*'replace:writeVersion', 'replace:fixResourceUrl'*/]); grunt.registerTask('deploy-app-embed', ['embed-app-init', 'clean:prebuild', 'uglify', 'less', 'copy', 'clean:postbuild']); diff --git a/build/documenteditor.json b/build/documenteditor.json index d3880ac263..9f20bf075e 100644 --- a/build/documenteditor.json +++ b/build/documenteditor.json @@ -218,98 +218,8 @@ ] }, "js": { - "requirejs": { - "options": { - "name": "../apps/documenteditor/mobile/app.js", - "out": "../deploy/web-apps/apps/documenteditor/mobile/app.js", - "baseUrl": "../apps/", - "inlineText": true, - "findNestedDependencies": true, - "preserveLicenseComments": false, - "optimizeAllPluginResources": true, - "paths": { - "jquery": "../vendor/jquery/jquery", - "underscore": "../vendor/underscore/underscore", - "backbone": "../vendor/backbone/backbone", - "framework7": "../vendor/framework7/js/framework7", - "text": "../vendor/requirejs-text/text", - "xregexp": "empty:", - "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", - "coapisettings": "empty:", - "allfonts": "empty:", - "sdk": "empty:", - "api": "empty:", - "core": "common/main/lib/core/application", - "extendes": "common/mobile/utils/extendes", - "notification": "common/main/lib/core/NotificationCenter", - "localstorage": "common/main/lib/util/LocalStorage", - "analytics": "common/Analytics", - "gateway": "common/Gateway", - "locale": "common/locale", - "irregularstack": "common/IrregularStack", - "sharedsettings": "common/mobile/utils/SharedSettings" - }, - "shim": { - "framework7": { - "exports": "Framework7" - }, - "underscore": { - "exports": "_" - }, - "backbone": { - "deps": [ - "underscore", - "jquery" - ], - "exports": "Backbone" - }, - "notification": { - "deps": [ - "backbone" - ] - }, - "core": { - "deps": [ - "backbone", - "notification", - "irregularstack", - "sharedsettings" - ] - }, - "extendes": { - "deps": [ - "underscore", - "jquery", - "framework7" - ] - }, - "sdk": { - "deps": [ - "jquery", - "underscore", - "coapisettings", - "allfonts", - "xregexp", - "sockjs", - "jszip", - "jszip-utils" - ] - }, - "gateway": { - "deps": [ - "jquery" - ] - }, - "analytics": { - "deps": [ - "jquery" - ] - } - } - } - } + "src": "../apps/documenteditor/mobile/dist/js/app.js", + "dest": "../deploy/web-apps/apps/documenteditor/mobile/dist/js/app.js" }, "css": { "ios": { diff --git a/build/presentationeditor.json b/build/presentationeditor.json index cececc2de8..9e5961a4aa 100644 --- a/build/presentationeditor.json +++ b/build/presentationeditor.json @@ -222,98 +222,8 @@ ] }, "js": { - "requirejs": { - "options": { - "name": "../apps/presentationeditor/mobile/app.js", - "out": "../deploy/web-apps/apps/presentationeditor/mobile/app.js", - "baseUrl": "../apps/", - "inlineText": true, - "findNestedDependencies": true, - "preserveLicenseComments": false, - "optimizeAllPluginResources": true, - "paths": { - "jquery": "../vendor/jquery/jquery", - "underscore": "../vendor/underscore/underscore", - "backbone": "../vendor/backbone/backbone", - "framework7": "../vendor/framework7/js/framework7", - "text": "../vendor/requirejs-text/text", - "xregexp": "empty:", - "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", - "coapisettings": "empty:", - "allfonts": "empty:", - "sdk": "empty:", - "api": "empty:", - "core": "common/main/lib/core/application", - "extendes": "common/mobile/utils/extendes", - "notification": "common/main/lib/core/NotificationCenter", - "localstorage": "common/main/lib/util/LocalStorage", - "analytics": "common/Analytics", - "gateway": "common/Gateway", - "locale": "common/locale", - "irregularstack": "common/IrregularStack", - "sharedsettings": "common/mobile/utils/SharedSettings" - }, - "shim": { - "framework7": { - "exports": "Framework7" - }, - "underscore": { - "exports": "_" - }, - "backbone": { - "deps": [ - "underscore", - "jquery" - ], - "exports": "Backbone" - }, - "notification": { - "deps": [ - "backbone" - ] - }, - "core": { - "deps": [ - "backbone", - "notification", - "irregularstack", - "sharedsettings" - ] - }, - "extendes": { - "deps": [ - "underscore", - "jquery", - "framework7" - ] - }, - "sdk": { - "deps": [ - "jquery", - "underscore", - "coapisettings", - "allfonts", - "xregexp", - "sockjs", - "jszip", - "jszip-utils" - ] - }, - "gateway": { - "deps": [ - "jquery" - ] - }, - "analytics": { - "deps": [ - "jquery" - ] - } - } - } - } + "src": "../apps/presentationeditor/mobile/dist/js/app.js", + "dest": "../deploy/web-apps/apps/presentationeditor/mobile/dist/js/app.js" }, "css": { "ios": { diff --git a/build/spreadsheeteditor.json b/build/spreadsheeteditor.json index 216e479159..784cea7d40 100644 --- a/build/spreadsheeteditor.json +++ b/build/spreadsheeteditor.json @@ -223,98 +223,8 @@ ] }, "js": { - "requirejs": { - "options": { - "name": "../apps/spreadsheeteditor/mobile/app.js", - "out": "../deploy/web-apps/apps/spreadsheeteditor/mobile/app.js", - "baseUrl": "../apps/", - "inlineText": true, - "findNestedDependencies": true, - "preserveLicenseComments": false, - "optimizeAllPluginResources": true, - "paths": { - "jquery": "../vendor/jquery/jquery", - "underscore": "../vendor/underscore/underscore", - "backbone": "../vendor/backbone/backbone", - "framework7": "../vendor/framework7/js/framework7", - "text": "../vendor/requirejs-text/text", - "xregexp": "empty:", - "sockjs": "empty:", - "jszip": "empty:", - "jszip-utils": "empty:", - "coapisettings": "empty:", - "allfonts": "empty:", - "sdk": "empty:", - "api": "empty:", - "core": "common/main/lib/core/application", - "extendes": "common/mobile/utils/extendes", - "notification": "common/main/lib/core/NotificationCenter", - "localstorage": "common/main/lib/util/LocalStorage", - "analytics": "common/Analytics", - "gateway": "common/Gateway", - "locale": "common/locale", - "irregularstack": "common/IrregularStack", - "sharedsettings": "common/mobile/utils/SharedSettings" - }, - "shim": { - "framework7": { - "exports": "Framework7" - }, - "underscore": { - "exports": "_" - }, - "backbone": { - "deps": [ - "underscore", - "jquery" - ], - "exports": "Backbone" - }, - "notification": { - "deps": [ - "backbone" - ] - }, - "core": { - "deps": [ - "backbone", - "notification", - "irregularstack", - "sharedsettings" - ] - }, - "extendes": { - "deps": [ - "underscore", - "jquery", - "framework7" - ] - }, - "sdk": { - "deps": [ - "jquery", - "underscore", - "coapisettings", - "allfonts", - "xregexp", - "sockjs", - "jszip", - "jszip-utils" - ] - }, - "gateway": { - "deps": [ - "jquery" - ] - }, - "analytics": { - "deps": [ - "jquery" - ] - } - } - } - } + "src": "../apps/spreadsheeteditor/mobile/dist/js/app.js", + "dest": "../deploy/web-apps/apps/spreadsheeteditor/mobile/dist/js/app.js" }, "css": { "ios": { From c09c77ffdea6a27bb428d191c2f95c02b5b55b7c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jul 2021 23:11:48 +0300 Subject: [PATCH 17/22] [SSE] Fix Bug 51414 --- apps/spreadsheeteditor/main/app/view/TableSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/TableSettings.js b/apps/spreadsheeteditor/main/app/view/TableSettings.js index 1658816f07..f247caa3c2 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettings.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettings.js @@ -436,7 +436,7 @@ define([ if (this.chFilter.isDisabled() !== (!this._state.CheckHeader || this._locked || value===null)) this.chFilter.setDisabled(!this._state.CheckHeader || this._locked || value===null); - if (needTablePictures) + if (needTablePictures || !this.mnuTableTemplatePicker) this.onApiInitTableTemplates(this.api.asc_getTablePictures(props)); //for table-template From 92f24c0d04839a0850faae550fd6842173b362ef Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Jul 2021 23:38:25 +0300 Subject: [PATCH 18/22] [SSE] Fix Bug 51406 --- .../spreadsheeteditor/main/app/view/FormatRulesEditDlg.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js index 020fecac18..d0c5b14f9e 100644 --- a/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js @@ -863,7 +863,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', record.value==Asc.c_oAscCfvoType.AutoMin || record.value==Asc.c_oAscCfvoType.AutoMax); me.setDefComboValue(combo.options.type, record.value, me.barControls[combo.options.type].range); }); - combo.setValue(arr[1].value); + var value = (i==0) ? Asc.c_oAscCfvoType.AutoMin : Asc.c_oAscCfvoType.AutoMax; + combo.setValue(value); Common.UI.FocusManager.add(this, combo); var range = new Common.UI.InputFieldBtn({ @@ -873,9 +874,10 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesEditDlg.template', allowBlank : true, btnHint : this.textSelectData, validateOnChange: false, - type : i + type : i, + disabled : (value==Asc.c_oAscCfvoType.AutoMin || value==Asc.c_oAscCfvoType.AutoMax || value==Asc.c_oAscCfvoType.Minimum || value==Asc.c_oAscCfvoType.Maximum) }); - range.setValue(0); + me.setDefComboValue(i, value, range); range.on('button:click', _.bind(this.onSelectData, this)); this.barControls.push({combo: combo, range: range}); Common.UI.FocusManager.add(this, range); From f142cfb697dccd425a6004b160d77576965f36d6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Jul 2021 21:05:42 +0300 Subject: [PATCH 19/22] Fix changing dataview items --- apps/common/main/lib/component/DataView.js | 14 ++++++- apps/documenteditor/main/app/view/Toolbar.js | 42 +++++++++---------- .../main/app/view/Toolbar.js | 34 +++++++-------- .../main/app/view/DocumentHolder.js | 30 ++++++------- 4 files changed, 66 insertions(+), 54 deletions(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index 59e1fbb6b1..b38eae935c 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -126,7 +126,7 @@ define([ me.template = me.options.template || me.template; - me.listenTo(me.model, 'change', me.render); + me.listenTo(me.model, 'change', this.model.get('skipRenderOnChange') ? me.onChange : me.render); me.listenTo(me.model, 'change:selected', me.onSelectChange); me.listenTo(me.model, 'remove', me.remove); }, @@ -185,6 +185,18 @@ define([ onSelectChange: function(model, selected) { this.trigger('select', this, model, selected); + }, + + onChange: function () { + if (_.isUndefined(this.model.id)) + return this; + var el = this.$el || $(this.el); + el.toggleClass('selected', this.model.get('selected') && this.model.get('allowSelected')); + el.toggleClass('disabled', !!this.model.get('disabled')); + + this.trigger('change', this, this.model); + + return this; } }); diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index 91a673d29e..576da4114f 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -1873,15 +1873,15 @@ define([ restoreHeight: 138, allowScrollbar: false, store: new Common.UI.DataViewStore([ - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}} + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, skipRenderOnChange: true} ]), itemTemplate: _.template('
') }); @@ -1894,14 +1894,14 @@ define([ restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}} + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true} ]), itemTemplate: _.template('
') }); @@ -1914,10 +1914,10 @@ define([ restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ - {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: -1}}, - {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}}, - {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}}, - {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}} + {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: -1}, skipRenderOnChange: true}, + {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 1}, skipRenderOnChange: true}, + {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 2}, skipRenderOnChange: true}, + {id: 'id-multilevels-' + Common.UI.getId(), data: {type: 2, subtype: 3}, skipRenderOnChange: true} ]), itemTemplate: _.template('
') }); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 8fc62a9cd2..6ce55b4840 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1304,15 +1304,15 @@ define([ restoreHeight: 138, allowScrollbar: false, store: new Common.UI.DataViewStore([ - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}}, - {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}} + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: -1}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 1}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 2}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 3}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 4}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 5}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 6}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 7}, skipRenderOnChange: true}, + {id: 'id-markers-' + Common.UI.getId(), data: {type: 0, subtype: 8}, skipRenderOnChange: true} ]), itemTemplate: _.template('
') }); @@ -1325,14 +1325,14 @@ define([ restoreHeight: 92, allowScrollbar: false, store: new Common.UI.DataViewStore([ - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}}, - {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}} + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: -1}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 4}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 5}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 6}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 1}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 2}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 3}, skipRenderOnChange: true}, + {id: 'id-numbers-' + Common.UI.getId(), data: {type: 1, subtype: 7}, skipRenderOnChange: true} ]), itemTemplate: _.template('
') }); diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index a317f9438f..d4e268cb43 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -946,21 +946,21 @@ define([ me.paraBulletsPicker = { conf: {rec: null}, store : new Common.UI.DataViewStore([ - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7}, - {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3}, - {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7} + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 1, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 2, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 3, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 4, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 5, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 6, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 7, skipRenderOnChange: true}, + {group: 'menu-list-bullet-group', id: 'id-markers-' + Common.UI.getId(), type: 0, subtype: 8, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 4, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 5, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 6, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 1, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 2, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 3, skipRenderOnChange: true}, + {group: 'menu-list-number-group', id: 'id-numbers-' + Common.UI.getId(), type: 1, subtype: 7, skipRenderOnChange: true} ]), groups: new Common.UI.DataViewGroupStore([ {id: 'menu-list-bullet-group', caption: this.textBullets}, From 703fe815529095dd50e059b04de3441ac0d4f7fc Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Jul 2021 22:09:10 +0300 Subject: [PATCH 20/22] Fix Bug 51435 --- apps/common/main/lib/component/DataView.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/DataView.js b/apps/common/main/lib/component/DataView.js index b38eae935c..cb893307e2 100644 --- a/apps/common/main/lib/component/DataView.js +++ b/apps/common/main/lib/component/DataView.js @@ -318,7 +318,8 @@ define([ if (this.enableKeyEvents && this.parentMenu && this.handleSelect) { if (!me.showLast) this.parentMenu.on('show:before', function(menu) { me.deselectAll(); }); - this.parentMenu.on('show:after', function(menu) { + this.parentMenu.on('show:after', function(menu, e) { + if (e && (menu.el !== e.target)) return; if (me.showLast) me.showLastSelected(); Common.NotificationCenter.trigger('dataview:focus'); _.delay(function() { From 0dd78bff97b758301b3576ec2071dd80f1dc57fd Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Jul 2021 17:04:58 +0300 Subject: [PATCH 21/22] Fix translation --- apps/presentationeditor/main/locale/en.json | 7 +++++++ apps/spreadsheeteditor/main/locale/en.json | 1 + 2 files changed, 8 insertions(+) diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 41c4ac9798..ea8a32bb6e 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -176,6 +176,13 @@ "Common.Views.Header.tipViewUsers": "View users and manage document access rights", "Common.Views.Header.txtAccessRights": "Change access rights", "Common.Views.Header.txtRename": "Rename", + "Common.Views.History.textCloseHistory": "Close History", + "Common.Views.History.textHide": "Collapse", + "Common.Views.History.textHideAll": "Hide detailed changes", + "Common.Views.History.textRestore": "Restore", + "Common.Views.History.textShow": "Expand", + "Common.Views.History.textShowAll": "Show detailed changes", + "Common.Views.History.textVer": "ver.", "Common.Views.ImageFromUrlDialog.textUrl": "Paste an image URL:", "Common.Views.ImageFromUrlDialog.txtEmpty": "This field is required", "Common.Views.ImageFromUrlDialog.txtNotUrl": "This field should be a URL in the \"http://www.example.com\" format", diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 546ea1b1cb..64290ef700 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -161,6 +161,7 @@ "Common.Views.AutoCorrectDialog.textRecognized": "Recognized Functions", "Common.Views.AutoCorrectDialog.textRecognizedDesc": "The following expressions are recognized math expressions. They will not be automatically italicized.", "Common.Views.AutoCorrectDialog.textReplace": "Replace", + "Common.Views.AutoCorrectDialog.textReplaceText": "Replace As You Type", "Common.Views.AutoCorrectDialog.textReplaceType": "Replace text as you type", "Common.Views.AutoCorrectDialog.textReset": "Reset", "Common.Views.AutoCorrectDialog.textResetAll": "Reset to default", From 3984fda98d672855de79080a8e99198c9a230671 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Jul 2021 17:13:59 +0300 Subject: [PATCH 22/22] Fix Bug 51460 --- apps/common/main/lib/view/Comments.js | 2 +- apps/common/main/lib/view/ReviewPopover.js | 2 +- apps/common/main/resources/less/comments.less | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/Comments.js b/apps/common/main/lib/view/Comments.js index b1e9090ea7..cd160dca93 100644 --- a/apps/common/main/lib/view/Comments.js +++ b/apps/common/main/lib/view/Comments.js @@ -102,7 +102,7 @@ define([ var view = this, textBox = $(this.el).find('textarea'), domTextBox = null, - minHeight = 50, + minHeight = 55, lineHeight = 0, scrollPos = 0, oldHeight = 0, diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index 6eda90bdae..759c2debed 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -176,7 +176,7 @@ define([ var view = this, textBox = this.$el.find('textarea'), domTextBox = null, - minHeight = 50, + minHeight = 55, lineHeight = 0, scrollPos = 0, oldHeight = 0, diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 415f98a0c4..b505e1ba1d 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -94,7 +94,7 @@ textarea { width: 100%; - height: 50px; + height: 55px; resize: none; margin-bottom: 5px; border: @scaled-one-px-value-ie solid @border-regular-control-ie;