From 95f8d7b0b968284f918b323419e8d0f5a0a1076c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Feb 2018 12:03:16 +0300 Subject: [PATCH 1/7] [DE] Fix Bug 36800 --- .../main/app/view/DocumentHolder.js | 24 ++++++++++++++++++- apps/documenteditor/main/locale/en.json | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 810557e60..0049fce41 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -3239,6 +3239,17 @@ define([ caption : '--' }); + var menuParaRefreshField = new Common.UI.MenuItem({ + caption: me.textRefreshField + }).on('click', function(item, e){ + me.api.asc_UpdateComplexField(item.options.fieldProps); + me.fireEvent('editcomplete', me); + }); + + var menuParaFieldSeparator = new Common.UI.MenuItem({ + caption : '--' + }); + this.textMenu = new Common.UI.Menu({ initMenu: function(value){ var isInShape = (value.imgProps && value.imgProps.value && !_.isNull(value.imgProps.value.get_ShapeProperties())); @@ -3353,6 +3364,14 @@ define([ menuParaTOCSettings.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc); menuParaTOCSeparator.setVisible(in_toc); + + var in_field = me.api.asc_GetCurrentComplexField(); + menuParaRefreshField.setVisible(!!in_field); + menuParaRefreshField.setDisabled(disabled); + menuParaFieldSeparator.setVisible(!!in_field); + if (in_field) { + menuParaRefreshField.options.fieldProps = in_field; + } }, items: [ me.menuSpellPara, @@ -3370,6 +3389,8 @@ define([ menuParaRemoveControl, menuParaControlSettings, menuParaControlSeparator, + menuParaRefreshField, + menuParaFieldSeparator, menuParaTOCSettings, menuParaTOCRefresh, menuParaTOCSeparator, @@ -3701,7 +3722,8 @@ define([ textUpdateAll: 'Refresh entire table', textUpdatePages: 'Refresh page numbers only', textTOCSettings: 'Table of contents settings', - textTOC: 'Table of contents' + textTOC: 'Table of contents', + textRefreshField: 'Refresh field' }, DE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2dc13721c..2321dd729 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -898,6 +898,7 @@ "DE.Views.DocumentHolder.textNextPage": "Next Page", "DE.Views.DocumentHolder.textPaste": "Paste", "DE.Views.DocumentHolder.textPrevPage": "Previous Page", + "DE.Views.DocumentHolder.textRefreshField": "Refresh field", "DE.Views.DocumentHolder.textRemove": "Remove", "DE.Views.DocumentHolder.textRemoveControl": "Remove content control", "DE.Views.DocumentHolder.textSettings": "Settings", From 5b14c0960aa39564cc3f31e568492fedb15ee989 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Feb 2018 15:03:47 +0300 Subject: [PATCH 2/7] [Common] ComboBox: bug in using itemsTemplate. --- apps/common/main/lib/component/ComboBox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/ComboBox.js b/apps/common/main/lib/component/ComboBox.js index 612729bb2..ad69d208f 100644 --- a/apps/common/main/lib/component/ComboBox.js +++ b/apps/common/main/lib/component/ComboBox.js @@ -146,7 +146,7 @@ define([ scope : me })); if (this.itemsTemplate) - this.cmpEl.find('ul').append( + this.cmpEl.find('ul').html( $(this.itemsTemplate({ items : items, scope : me From 6fe96a17b2ce5850e81366fb5315058a7718fda0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Feb 2018 10:58:30 +0300 Subject: [PATCH 3/7] [SSE] Fix Bug 36965 --- apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js | 7 +++++-- apps/spreadsheeteditor/main/locale/en.json | 2 ++ apps/spreadsheeteditor/mobile/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 526d98866..53e4fb9bd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1158,6 +1158,10 @@ define([ config.msg = this.errorDataRange; break; + case Asc.c_oAscError.ID.MaxDataPointsError: + config.msg = this.errorMaxPoints; + break; + case Asc.c_oAscError.ID.VKeyEncrypt: config.msg = this.errorToken; break; @@ -2194,7 +2198,8 @@ define([ txtStyle_Percent: 'Percent', txtStyle_Comma: 'Comma', warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', - errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later." + errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.", + errorMaxPoints: "The maximum number of points in series per chart is 4096." } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index dcf98fae2..92dae25e3 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -1521,7 +1521,9 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' Common.UI.warning({msg: this.errorStockChart}); } else if (isvalid == Asc.c_oAscError.ID.MaxDataSeriesError) { Common.UI.warning({msg: this.errorMaxRows}); - } else + } else if (isvalid == Asc.c_oAscError.ID.MaxDataPointsError) + Common.UI.warning({msg: this.errorMaxPoints}); + else this.txtDataRange.cmpEl.find('input').focus(); return false; } else @@ -1773,7 +1775,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template' textAltTitle: 'Title', textAltDescription: 'Description', textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.', - textSurface: 'Surface' + textSurface: 'Surface', + errorMaxPoints: 'ERROR! The maximum number of points in series per chart is 4096.' }, SSE.Views.ChartSettingsDlg || {})); }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index abc5cb9c2..fca1c37aa 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -371,6 +371,7 @@ "SSE.Controllers.Main.errorLockedAll": "The operation could not be done as the sheet has been locked by another user.", "SSE.Controllers.Main.errorLockedCellPivot": "You cannot change data inside a pivot table.", "SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", + "SSE.Controllers.Main.errorMaxPoints": "The maximum number of points in series per chart is 4096.", "SSE.Controllers.Main.errorMoveRange": "Cannot change part of a merged cell", "SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded
the allowed number of characters and it was removed.", "SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", @@ -916,6 +917,7 @@ "SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancel", "SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255", "SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:
opening price, max price, min price, closing price.", + "SSE.Views.ChartSettingsDlg.errorMaxPoints": "ERROR! The maximum number of points in series per chart is 4096.", "SSE.Views.ChartSettingsDlg.textAlt": "Alternative Text", "SSE.Views.ChartSettingsDlg.textAltDescription": "Description", "SSE.Views.ChartSettingsDlg.textAltTip": "The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index 6b343d76a..bdf91ee37 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -827,6 +827,10 @@ define([ config.msg = this.errorDataRange; break; + case Asc.c_oAscError.ID.MaxDataPointsError: + config.msg = this.errorMaxPoints; + break; + case Asc.c_oAscError.ID.FrmlOperandExpected: config.msg = this.errorOperandExpected; config.closable = true; @@ -1445,7 +1449,8 @@ define([ txtStyle_Currency: 'Currency', txtStyle_Percent: 'Percent', txtStyle_Comma: 'Comma', - warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.' + warnNoLicenseUsers: 'This version of ONLYOFFICE Editors has certain limitations for concurrent users.
If you need more please consider upgrading your current license or purchasing a commercial one.', + errorMaxPoints: 'The maximum number of points in series per chart is 4096.' } })(), 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 9fc71c590..e08b9693f 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -137,6 +137,7 @@ "SSE.Controllers.Main.errorLockedWorksheetRename": "The sheet cannot be renamed at the moment as it is being renamed by another user", "SSE.Controllers.Main.errorMailMergeLoadFile": "Loading failed", "SSE.Controllers.Main.errorMailMergeSaveFile": "Merge failed.", + "SSE.Controllers.Main.errorMaxPoints": "The maximum number of points in series per chart is 4096.", "SSE.Controllers.Main.errorMoveRange": "Cannot change part of a merged cell", "SSE.Controllers.Main.errorOpenWarning": "The length of one of the formulas in the file exceeded
the allowed number of characters and it was removed.", "SSE.Controllers.Main.errorOperandExpected": "The entered function syntax is not correct. Please check if you are missing one of the parentheses - '(' or ')'.", From 35542d4ee56f859c3bb91acb39eca2b85847fd50 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Feb 2018 16:17:15 +0300 Subject: [PATCH 4/7] Change colors and layout. --- apps/common/main/resources/less/layout.less | 2 +- apps/documenteditor/main/resources/less/layout.less | 2 +- apps/documenteditor/main/resources/less/toolbar.less | 2 +- apps/presentationeditor/main/resources/less/layout.less | 2 +- apps/spreadsheeteditor/main/resources/less/layout.less | 2 +- apps/spreadsheeteditor/main/resources/less/toolbar.less | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/main/resources/less/layout.less b/apps/common/main/resources/less/layout.less index c3ef9c3fc..4f446d5df 100644 --- a/apps/common/main/resources/less/layout.less +++ b/apps/common/main/resources/less/layout.less @@ -49,7 +49,7 @@ } > .layout-resizer { - width: 4px; + width: 2px; cursor: col-resize; &.move { diff --git a/apps/documenteditor/main/resources/less/layout.less b/apps/documenteditor/main/resources/less/layout.less index 1215b908d..38e3d28a7 100644 --- a/apps/documenteditor/main/resources/less/layout.less +++ b/apps/documenteditor/main/resources/less/layout.less @@ -39,7 +39,7 @@ label { top:0; right: 0; bottom: 0; - background-color: #f4f4f4; + background-color: @gray-light; overflow: hidden; } diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 6e08bd8a0..b8516bb34 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -1,5 +1,5 @@ -@tabs-bg-color: #4f6279; +@tabs-bg-color: #446995; .toolbar { &:not(.cover) { diff --git a/apps/presentationeditor/main/resources/less/layout.less b/apps/presentationeditor/main/resources/less/layout.less index de328fc7f..1313b49b1 100644 --- a/apps/presentationeditor/main/resources/less/layout.less +++ b/apps/presentationeditor/main/resources/less/layout.less @@ -50,7 +50,7 @@ label { top:0; right: 0; bottom: 0; - background-color: #f4f4f4; + background-color: @gray-light; overflow: hidden; } diff --git a/apps/spreadsheeteditor/main/resources/less/layout.less b/apps/spreadsheeteditor/main/resources/less/layout.less index 5ba12c1da..9d7149026 100644 --- a/apps/spreadsheeteditor/main/resources/less/layout.less +++ b/apps/spreadsheeteditor/main/resources/less/layout.less @@ -33,7 +33,7 @@ label { top:0; right: 0; bottom: 0; - background-color: #f4f4f4; + background-color: @gray-light; overflow: hidden; } diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index 934805ee3..ebacaa1d5 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -1,4 +1,4 @@ -@tabs-bg-color: #48795c; +@tabs-bg-color: #40865c; .toolbar { &:not(.cover) { From dd0aa73f51f00d7d0704def7c93e89747c5ab94c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 27 Feb 2018 17:02:33 +0300 Subject: [PATCH 5/7] [PE] Fix Bug 35700 --- apps/presentationeditor/main/app/template/StatusBar.template | 2 +- apps/presentationeditor/main/app/view/Statusbar.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/presentationeditor/main/app/template/StatusBar.template b/apps/presentationeditor/main/app/template/StatusBar.template index 6e6bd8ad3..898b9759f 100644 --- a/apps/presentationeditor/main/app/template/StatusBar.template +++ b/apps/presentationeditor/main/app/template/StatusBar.template @@ -2,7 +2,7 @@
- +