From de4d797a3f48e567d7a715ae0d118d16103f1392 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Oct 2019 17:10:09 +0300 Subject: [PATCH 1/5] Fix Bug 43056 --- apps/common/main/lib/view/ReviewPopover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index a96e9ace6..a3f507da5 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -1162,9 +1162,9 @@ define([ insertEmailToTextbox: function(str, left, right) { var textBox = this.commentsView.getTextBox(), val = textBox.val(); - textBox.val(val.substring(0, left) + '+' + str + val.substring(right+1, val.length)); + textBox.val(val.substring(0, left) + '+' + str + ' ' + val.substring(right+1, val.length)); setTimeout(function(){ - textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 1; + textBox[0].selectionStart = textBox[0].selectionEnd = left + str.length + 2; }, 10); }, From ea2d8e1e37ad8091057bbfdf1c16876123ce109d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Oct 2019 17:36:52 +0300 Subject: [PATCH 2/5] [DE] Add translation for caption errors --- apps/documenteditor/main/app/controller/Main.js | 10 ++++++++-- apps/documenteditor/main/locale/en.json | 3 +++ apps/documenteditor/main/locale/ru.json | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 44de0321e..0b6eb8d15 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -132,7 +132,10 @@ define([ "Table Index Cannot be Zero": this.txtTableInd, "Undefined Bookmark": this.txtUndefBookmark, "Unexpected End of Formula": this.txtEndOfFormula, - "Hyperlink": this.txtHyperlink + "Hyperlink": this.txtHyperlink, + "Error! Main Document Only.": this.txtMainDocOnly, + "Error! Not a valid bookmark self-reference.": this.txtNotValidBookmark, + "Error! No text of specified style in document.": this.txtNoText }; styleNames.forEach(function(item){ translate[item] = me['txtStyle_' + item.replace(/ /g, '_')] || item; @@ -2464,7 +2467,10 @@ define([ textCustomLoader: 'Please note that according to the terms of the license you are not entitled to change the loader.
Please contact our Sales Department to get a quote.', txtHyperlink: 'Hyperlink', waitText: 'Please, wait...', - errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.' + errorFileSizeExceed: 'The file size exceeds the limitation set for your server.
Please contact your Document Server administrator for details.', + txtMainDocOnly: 'Error! Main Document Only.', + txtNotValidBookmark: 'Error! Not a valid bookmark self-reference.', + txtNoText: 'Error! No text of specified style in document.' } })(), 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 5c7b05055..a7ce1cc84 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -647,6 +647,9 @@ "DE.Controllers.Main.warnNoLicense": "This version of %1 editors has certain limitations for concurrent connections to the document server.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "DE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "DE.Controllers.Main.txtMainDocOnly": "Error! Main Document Only.", + "DE.Controllers.Main.txtNotValidBookmark": "Error! Not a valid bookmark self-reference.", + "DE.Controllers.Main.txtNoText": "Error! No text of specified style in document.", "DE.Controllers.Navigation.txtBeginning": "Beginning of document", "DE.Controllers.Navigation.txtGotoBeginning": "Go to the beginning of the document", "DE.Controllers.Statusbar.textHasChanges": "New changes have been tracked", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index ec181166b..07a382893 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -646,6 +646,7 @@ "DE.Controllers.Main.warnNoLicense": "Эта версия редакторов %1 имеет некоторые ограничения по количеству одновременных подключений к серверу документов.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnNoLicenseUsers": "Эта версия редакторов %1 имеет некоторые ограничения по числу одновременно работающих пользователей.
Если требуется больше, рассмотрите вопрос о покупке коммерческой лицензии.", "DE.Controllers.Main.warnProcessRightsChange": "Вам было отказано в праве на редактирование этого файла.", + "DE.Controllers.Main.txtNoText": "Ошибка! Текст указанного стиля в документе отсутствует.", "DE.Controllers.Navigation.txtBeginning": "Начало документа", "DE.Controllers.Navigation.txtGotoBeginning": "Перейти в начало документа", "DE.Controllers.Statusbar.textHasChanges": "Отслежены новые изменения", From b4167ac4b4f282ab0089090d337311db240ef3d8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 3 Oct 2019 18:13:14 +0300 Subject: [PATCH 3/5] [DE] Bug 35506 --- apps/documenteditor/main/app/controller/Toolbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 002df4c74..704255430 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -802,7 +802,7 @@ define([ need_disable = paragraph_locked || header_locked || in_para && !can_add_image || in_equation || control_plain; toolbar.btnInsertImage.setDisabled(need_disable); - toolbar.btnInsertTextArt.setDisabled(need_disable || !can_add_image || in_image || in_footnote); + toolbar.btnInsertTextArt.setDisabled(need_disable || in_footnote); if (in_chart !== this._state.in_chart) { toolbar.btnInsertChart.updateHint(in_chart ? toolbar.tipChangeChart : toolbar.tipInsertChart); From 27dd33133e749a08caf11a7ec8de56debb222def Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 4 Oct 2019 10:36:10 +0300 Subject: [PATCH 4/5] Don't show skeleton loader when use customization.toolbarNoTabs=true mode --- apps/api/documents/api.js | 5 +++-- apps/documenteditor/main/app/controller/Main.js | 4 +++- apps/presentationeditor/main/app/controller/Main.js | 4 +++- apps/spreadsheeteditor/main/app/controller/Main.js | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 0bc80b97d..ed34a79cb 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -738,9 +738,10 @@ : "main"; var index = "/index.html"; - if (config.editorConfig && config.editorConfig.targetApp!=='desktop') { + if (config.editorConfig) { var customization = config.editorConfig.customization; - if ( typeof(customization) == 'object' && (customization.loaderName || customization.loaderLogo)) { + if ( typeof(customization) == 'object' && ( customization.toolbarNoTabs || + (config.editorConfig.targetApp!=='desktop') && (customization.loaderName || customization.loaderLogo))) { index = "/index_loader.html"; } } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 0b6eb8d15..6c9c5b4b7 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -363,8 +363,10 @@ define([ if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); - if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) + if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || + (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { $('#editor_sdk').append('
' + '
'.repeat(20) + '
'); + } Common.Controllers.Desktop.init(this.appOptions); }, diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 9e940ee48..8ac192e66 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -330,8 +330,10 @@ define([ if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); - if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) + if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || + (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { $('#editor_sdk').append('
'); + } Common.Controllers.Desktop.init(this.appOptions); }, diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index cd91282d0..9c399ae43 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -360,8 +360,10 @@ define([ if (this.appOptions.location == 'us' || this.appOptions.location == 'ca') Common.Utils.Metric.setDefaultMetric(Common.Utils.Metric.c_MetricUnits.inch); - if (!this.editorConfig.customization || !(this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)) + if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || + (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { $('#editor_sdk').append('
' + '
'.repeat(2) + '
'); + } this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge); Common.Controllers.Desktop.init(this.appOptions); From 7152a85f870a447ac06d09f04a01d1eda35a51bc Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 4 Oct 2019 11:01:51 +0300 Subject: [PATCH 5/5] [SSE] Append toolbar skeleton --- apps/documenteditor/main/index.html | 13 +++- apps/spreadsheeteditor/main/index.html | 59 ++++++++++++++++++- apps/spreadsheeteditor/main/index.html.deploy | 59 ++++++++++++++++++- 3 files changed, 128 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index bf62d1c20..9c2093f88 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -220,7 +220,18 @@ -
+
+
+
+
+
+
+
+
+
+
+
+