From aac0467d03163a0abd91c447146c0012cc821bca Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Aug 2019 12:48:59 +0300 Subject: [PATCH 01/12] [SSE] Fix Bug 42510 --- apps/spreadsheeteditor/main/app/controller/FormulaDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js index b5f2ebde2..5093269b1 100644 --- a/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js +++ b/apps/spreadsheeteditor/main/app/controller/FormulaDialog.js @@ -335,7 +335,7 @@ define([ allFunctions.push(func); } - formulaGroup.set('functions', functions); + formulaGroup.set('functions', _.sortBy(functions, function (model) {return model.get('name'); })); store.push(formulaGroup); } From f65057491cde692861fb6da16e701bd262525696 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 22 Aug 2019 17:16:07 +0300 Subject: [PATCH 02/12] [DE] Add methods to disable mail merge and version history (use in desktop app) --- apps/documenteditor/main/app/controller/Main.js | 11 +++++++++++ apps/documenteditor/main/app/controller/Toolbar.js | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 61f8dee9d..25986829a 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2124,6 +2124,17 @@ define([ this.beforeShowDummyComment = true; }, + DisableMailMerge: function() { + this.appOptions.mergeFolderUrl = ""; + var toolbarController = this.getApplication().getController('Toolbar'); + toolbarController && toolbarController.DisableMailMerge(); + }, + + DisableVersionHistory: function() { + this.editorConfig.canUseHistory = false; + this.appOptions.canUseHistory = false; + }, + leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', criticalErrorTitle: 'Error', notcriticalErrorTitle: 'Warning', diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index c8bdca3d9..7bbd02381 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -2615,7 +2615,7 @@ define([ this.toolbar.btnRedo.setDisabled(this._state.can_redo!==true); this.toolbar.btnCopy.setDisabled(this._state.can_copycut!==true); this.toolbar.btnPrint.setDisabled(!this.toolbar.mode.canPrint); - if (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients) + if (!this._state.mmdisable && (this.toolbar.mode.fileChoiceUrl || this.toolbar.mode.canRequestMailMergeRecipients)) this.toolbar.btnMailRecepients.setDisabled(false); this._state.activated = true; @@ -2623,6 +2623,11 @@ define([ this.onApiPageSize(props.get_W(), props.get_H()); }, + DisableMailMerge: function() { + this._state.mmdisable = true; + this.toolbar && this.toolbar.btnMailRecepients && this.toolbar.btnMailRecepients.setDisabled(true); + }, + updateThemeColors: function() { var updateColors = function(picker, defaultColorIndex) { if (picker) { From c6babae479aefe50cae1debfabdacb4d7715b831 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 23 Aug 2019 10:31:16 +0300 Subject: [PATCH 03/12] [mobile] Fix Bug 42297 --- apps/documenteditor/mobile/app.js | 2 +- apps/presentationeditor/mobile/app.js | 2 +- apps/spreadsheeteditor/mobile/app.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/app.js b/apps/documenteditor/mobile/app.js index 465d67e69..cfd2b1b40 100644 --- a/apps/documenteditor/mobile/app.js +++ b/apps/documenteditor/mobile/app.js @@ -183,7 +183,7 @@ require([ //Store Framework7 initialized instance for easy access window.uiApp = new Framework7({ // Default title for modals - modalTitle: '{{MOBILE_MODAL_TITLE}}', + modalTitle: '{{APP_TITLE_TEXT}}', // Enable tap hold events tapHold: true, diff --git a/apps/presentationeditor/mobile/app.js b/apps/presentationeditor/mobile/app.js index c2f9901d1..ec416bc5e 100644 --- a/apps/presentationeditor/mobile/app.js +++ b/apps/presentationeditor/mobile/app.js @@ -181,7 +181,7 @@ require([ //Store Framework7 initialized instance for easy access window.uiApp = new Framework7({ // Default title for modals - modalTitle: '{{MOBILE_MODAL_TITLE}}', + modalTitle: '{{APP_TITLE_TEXT}}', // If it is webapp, we can enable hash navigation: // pushState: false, diff --git a/apps/spreadsheeteditor/mobile/app.js b/apps/spreadsheeteditor/mobile/app.js index 82d26b8e4..582f07fd7 100644 --- a/apps/spreadsheeteditor/mobile/app.js +++ b/apps/spreadsheeteditor/mobile/app.js @@ -167,7 +167,7 @@ require([ //Store Framework7 initialized instance for easy access window.uiApp = new Framework7({ // Default title for modals - modalTitle: '{{MOBILE_MODAL_TITLE}}', + modalTitle: '{{APP_TITLE_TEXT}}', // Enable tap hold events tapHold: true, From 20485598b55c8a2810c6c0ac65c43878c5ee4fd2 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 23 Aug 2019 11:42:08 +0300 Subject: [PATCH 04/12] [mobile] Bug 39380 --- apps/documenteditor/mobile/app/controller/Settings.js | 10 +++++++++- apps/presentationeditor/mobile/app/view/Settings.js | 10 +++++++++- .../mobile/app/controller/Settings.js | 10 +++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index d122f1bf6..a6e2aab72 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -553,7 +553,15 @@ define([ }, onShowHelp: function () { - window.open('{{SUPPORT_URL}}', "_blank"); + var url = '{{HELP_URL}}'; + if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; + } else if (Common.SharedSettings.get('sailfish')) { + url+='mobile-applications/documents/sailfish/index.aspx'; + } else { + url+='mobile-applications/documents/index.aspx'; + } + window.open(url, "_blank"); this.hideModal(); }, diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index 11b654716..bf73f44a4 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -180,7 +180,15 @@ define([ }, showHelp: function () { - window.open('{{SUPPORT_URL}}', "_blank"); + var url = '{{HELP_URL}}'; + if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; + } else if (Common.SharedSettings.get('sailfish')) { + url+='mobile-applications/documents/sailfish/index.aspx'; + } else { + url+='mobile-applications/documents/index.aspx'; + } + window.open(url, "_blank"); PE.getController('Settings').hideModal(); }, diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 878e9affb..67542bfc6 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -112,7 +112,15 @@ define([ 'Settings': { 'page:show' : this.onPageShow , 'settings:showhelp': function(e) { - window.open('{{SUPPORT_URL}}', "_blank"); + var url = '{{HELP_URL}}'; + if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; + } else if (Common.SharedSettings.get('sailfish')) { + url+='mobile-applications/documents/sailfish/index.aspx'; + } else { + url+='mobile-applications/documents/index.aspx'; + } + window.open(url, "_blank"); this.hideModal(); } } From fb0af71a5671d8e6f21fb559aa2d78c2a011aeaa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Aug 2019 11:59:24 +0300 Subject: [PATCH 05/12] [mobile] Bug 39380 --- apps/documenteditor/mobile/app/controller/Settings.js | 3 +++ apps/presentationeditor/mobile/app/view/Settings.js | 3 +++ apps/spreadsheeteditor/mobile/app/controller/Settings.js | 3 +++ build/Gruntfile.js | 3 +++ 4 files changed, 12 insertions(+) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index a6e2aab72..b21d47114 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -554,6 +554,9 @@ define([ onShowHelp: function () { var url = '{{HELP_URL}}'; + if (url.charAt(url.length-1) !== '/') { + url += '/'; + } if (Common.SharedSettings.get('android')) { url+='mobile-applications/documents/android/index.aspx'; } else if (Common.SharedSettings.get('sailfish')) { diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index bf73f44a4..5d8e3a08e 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -181,6 +181,9 @@ define([ showHelp: function () { var url = '{{HELP_URL}}'; + if (url.charAt(url.length-1) !== '/') { + url += '/'; + } if (Common.SharedSettings.get('android')) { url+='mobile-applications/documents/android/index.aspx'; } else if (Common.SharedSettings.get('sailfish')) { diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 67542bfc6..55153f717 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -113,6 +113,9 @@ define([ 'page:show' : this.onPageShow , 'settings:showhelp': function(e) { var url = '{{HELP_URL}}'; + if (url.charAt(url.length-1) !== '/') { + url += '/'; + } if (Common.SharedSettings.get('android')) { url+='mobile-applications/documents/android/index.aspx'; } else if (Common.SharedSettings.get('sailfish')) { diff --git a/build/Gruntfile.js b/build/Gruntfile.js index 37c317e18..6cf6ff6a0 100644 --- a/build/Gruntfile.js +++ b/build/Gruntfile.js @@ -43,6 +43,9 @@ module.exports = function(grunt) { }, { from: /\{\{APP_TITLE_TEXT\}\}/g, to: process.env['APP_TITLE_TEXT'] || 'ONLYOFFICE' + }, { + from: /\{\{HELP_URL\}\}/g, + to: process.env['HELP_URL'] || 'https://helpcenter.onlyoffice.com' }]; var helpreplacements = [ From b343c8c3e8d2aa5e2c26aed0064ca6b4130a9f97 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 23 Aug 2019 13:10:36 +0300 Subject: [PATCH 06/12] [mobile] Display review for view mode --- apps/common/mobile/lib/controller/Collaboration.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/common/mobile/lib/controller/Collaboration.js b/apps/common/mobile/lib/controller/Collaboration.js index 673092e46..63d5296a4 100644 --- a/apps/common/mobile/lib/controller/Collaboration.js +++ b/apps/common/mobile/lib/controller/Collaboration.js @@ -209,7 +209,10 @@ define([ Common.Utils.addScrollIfNeed('.page[data-page=comments-view]', '.page[data-page=comments-view] .page-content'); } else { if(editor === 'DE' && !this.appConfig.canReview) { - $('#reviewing-settings').hide(); + this.canViewReview = me.api.asc_HaveRevisionsChanges(true); + if (!this.canViewReview) { + $('#reviewing-settings').hide(); + } } } }, @@ -282,6 +285,11 @@ define([ $('#settings-reject-all').removeClass('disabled'); $('#settings-review').removeClass('disabled'); } + if (!this.appConfig.canReview) { + $('#settings-review').hide(); + $('#settings-accept-all').hide(); + $('#settings-reject-all').hide(); + } }, onTrackChanges: function(e) { @@ -384,6 +392,10 @@ define([ $('#btn-prev-change').addClass('disabled'); $('#btn-next-change').addClass('disabled'); } + if (!this.appConfig.canReview) { + $('#btn-accept-change').addClass('disabled'); + $('#btn-reject-change').addClass('disabled'); + } }, onPrevChange: function() { From 58ffa1aa69c3ffbc278d24bbae9677d02e59c27a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Aug 2019 15:19:11 +0300 Subject: [PATCH 07/12] [DE] Fix Bug 42530 --- .../documenteditor/main/app/view/StyleTitleDialog.js | 12 +++++++----- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/main/locale/ru.json | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js index 9a0deabee..238efe689 100644 --- a/apps/documenteditor/main/app/view/StyleTitleDialog.js +++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js @@ -71,6 +71,7 @@ define([ ].join(''); this.options.tpl = _.template(this.template)(this.options); + this.options.formats = this.options.formats || []; Common.UI.Window.prototype.initialize.call(this, this.options); }, @@ -100,6 +101,7 @@ define([ $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this)); + this.options.formats.unshift({value: -1, displayValue: this.txtSameAs}); this.cmbNextStyle = new Common.UI.ComboBox({ el : $('#id-dlg-style-next-par'), style : 'width: 100%;', @@ -109,8 +111,7 @@ define([ data : this.options.formats, disabled : (this.options.formats.length==0) }); - if (this.options.formats.length>0) - this.cmbNextStyle.setValue(this.options.formats[0].value); + this.cmbNextStyle.setValue(-1); }, show: function() { @@ -128,8 +129,8 @@ define([ }, getNextStyle: function () { - var me = this; - return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null; + var val = this.cmbNextStyle.getValue(); + return (val!=-1) ? val : null; }, onBtnClick: function(event) { @@ -161,7 +162,8 @@ define([ textHeader: 'Create New Style', txtEmpty: 'This field is required', txtNotEmpty: 'Field must not be empty', - textNextStyle: 'Next paragraph style' + textNextStyle: 'Next paragraph style', + txtSameAs: 'Same as created new style' }, DE.Views.StyleTitleDialog || {})) diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 81107c503..fe28eb861 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1873,6 +1873,7 @@ "DE.Views.StyleTitleDialog.textTitle": "Title", "DE.Views.StyleTitleDialog.txtEmpty": "This field is required", "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty", + "DE.Views.StyleTitleDialog.txtSameAs": "Same as created new style", "DE.Views.TableFormulaDialog.cancelButtonText": "Cancel", "DE.Views.TableFormulaDialog.okButtonText": "OK", "DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark", diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index 3d8d69c36..57a23f1b8 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1873,6 +1873,7 @@ "DE.Views.StyleTitleDialog.textTitle": "Название", "DE.Views.StyleTitleDialog.txtEmpty": "Это поле необходимо заполнить", "DE.Views.StyleTitleDialog.txtNotEmpty": "Поле не может быть пустым", + "DE.Views.StyleTitleDialog.txtSameAs": "Такой же, как создаваемый стиль", "DE.Views.TableFormulaDialog.cancelButtonText": "Отмена", "DE.Views.TableFormulaDialog.okButtonText": "ОК", "DE.Views.TableFormulaDialog.textBookmark": "Вставить закладку", From 8a6af205d978daaa75d88075e69cb38187342f95 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 23 Aug 2019 15:55:30 +0300 Subject: [PATCH 08/12] [mobile] Bug 39380 --- apps/documenteditor/mobile/app/controller/Settings.js | 6 +++--- apps/presentationeditor/mobile/app/view/Settings.js | 6 +++--- apps/spreadsheeteditor/mobile/app/controller/Settings.js | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/Settings.js b/apps/documenteditor/mobile/app/controller/Settings.js index b21d47114..8269cbea5 100644 --- a/apps/documenteditor/mobile/app/controller/Settings.js +++ b/apps/documenteditor/mobile/app/controller/Settings.js @@ -557,10 +557,10 @@ define([ if (url.charAt(url.length-1) !== '/') { url += '/'; } - if (Common.SharedSettings.get('android')) { - url+='mobile-applications/documents/android/index.aspx'; - } else if (Common.SharedSettings.get('sailfish')) { + if (Common.SharedSettings.get('sailfish')) { url+='mobile-applications/documents/sailfish/index.aspx'; + } else if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; } else { url+='mobile-applications/documents/index.aspx'; } diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index 5d8e3a08e..dc9240246 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -184,10 +184,10 @@ define([ if (url.charAt(url.length-1) !== '/') { url += '/'; } - if (Common.SharedSettings.get('android')) { - url+='mobile-applications/documents/android/index.aspx'; - } else if (Common.SharedSettings.get('sailfish')) { + if (Common.SharedSettings.get('sailfish')) { url+='mobile-applications/documents/sailfish/index.aspx'; + } else if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; } else { url+='mobile-applications/documents/index.aspx'; } diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 55153f717..462a4eeb5 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -116,10 +116,10 @@ define([ if (url.charAt(url.length-1) !== '/') { url += '/'; } - if (Common.SharedSettings.get('android')) { - url+='mobile-applications/documents/android/index.aspx'; - } else if (Common.SharedSettings.get('sailfish')) { + if (Common.SharedSettings.get('sailfish')) { url+='mobile-applications/documents/sailfish/index.aspx'; + } else if (Common.SharedSettings.get('android')) { + url+='mobile-applications/documents/android/index.aspx'; } else { url+='mobile-applications/documents/index.aspx'; } From ef91d66f2f539adf7be10a7370721177791c1503 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 23 Aug 2019 17:23:44 +0300 Subject: [PATCH 09/12] [DE] View review changes in edit mode (don't check revisions on start, as they may come from other users) --- apps/common/main/lib/controller/ReviewChanges.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index 9fe50e74d..f6c966be0 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -670,13 +670,13 @@ define([ } }); } else if (config.canViewReview) { - config.canViewReview = me.api.asc_HaveRevisionsChanges(true); // check revisions from all users + config.canViewReview = (config.isEdit || me.api.asc_HaveRevisionsChanges(true)); // check revisions from all users if (config.canViewReview) { var val = Common.localStorage.getItem(me.view.appPrefix + "review-mode"); if (val===null) val = me.appConfig.customization && /^(original|final|markup)$/i.test(me.appConfig.customization.reviewDisplay) ? me.appConfig.customization.reviewDisplay.toLocaleLowerCase() : 'original'; - me.turnDisplayMode(config.isRestrictedEdit ? 'markup' : val); // load display mode only in viewer - me.view.turnDisplayMode(config.isRestrictedEdit ? 'markup' : val); + me.turnDisplayMode((config.isEdit || config.isRestrictedEdit) ? 'markup' : val); // load display mode only in viewer + me.view.turnDisplayMode((config.isEdit || config.isRestrictedEdit) ? 'markup' : val); } } From cbf983a2eeb4d184f0d660e11d0cc75dd1a1f85d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Aug 2019 13:03:00 +0300 Subject: [PATCH 10/12] Fix Bug 35189 --- .../mobile/app/template/Settings.template | 18 +++++++++--------- .../documenteditor/mobile/app/view/Settings.js | 9 ++++++++- .../mobile/app/template/Settings.template | 18 +++++++++--------- .../mobile/app/view/Settings.js | 9 ++++++++- .../mobile/app/template/Settings.template | 18 +++++++++--------- .../mobile/app/view/Settings.js | 9 ++++++++- 6 files changed, 51 insertions(+), 30 deletions(-) diff --git a/apps/documenteditor/mobile/app/template/Settings.template b/apps/documenteditor/mobile/app/template/Settings.template index a3e6bc4b6..cde8bf0fd 100644 --- a/apps/documenteditor/mobile/app/template/Settings.template +++ b/apps/documenteditor/mobile/app/template/Settings.template @@ -633,21 +633,21 @@

DOCUMENT EDITOR

-

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

<%= scope.textVersion %> <%= prodversion %>

-

{{PUBLISHER_NAME}}

-

{{PUBLISHER_ADDRESS}}

-

{{SUPPORT_EMAIL}}

-

{{PUBLISHER_PHONE}}

-

<% print(/^(?:https?:\/{2})?(\S+)/.exec('{{PUBLISHER_URL}}')[1]); %>

+

<%= publishername %>

+

<%= publisheraddr %>

+

<%= supportemail %>

+

<%= phonenum %>

+

<%= printed_url %>

diff --git a/apps/documenteditor/mobile/app/view/Settings.js b/apps/documenteditor/mobile/app/view/Settings.js index 84dbd7bcb..16c8fb0c7 100644 --- a/apps/documenteditor/mobile/app/view/Settings.js +++ b/apps/documenteditor/mobile/app/view/Settings.js @@ -91,7 +91,14 @@ define([ phone : Common.SharedSettings.get('phone'), orthography: Common.SharedSettings.get('sailfish'), scope : this, - width : $(window).width() + width : $(window).width(), + prodversion: '{{PRODUCT_VERSION}}', + publishername: '{{PUBLISHER_NAME}}', + publisheraddr: '{{PUBLISHER_ADDRESS}}', + publisherurl: '{{PUBLISHER_URL}}', + printed_url: ("{{PUBLISHER_URL}}").replace(/https?:\/{2}/, "").replace(/\/$/,""), + supportemail: '{{SUPPORT_EMAIL}}', + phonenum: '{{PUBLISHER_PHONE}}' })); return this; diff --git a/apps/presentationeditor/mobile/app/template/Settings.template b/apps/presentationeditor/mobile/app/template/Settings.template index d9b90cb1b..13dfa7993 100644 --- a/apps/presentationeditor/mobile/app/template/Settings.template +++ b/apps/presentationeditor/mobile/app/template/Settings.template @@ -386,21 +386,21 @@

PRESENTATION EDITOR

-

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

<%= scope.textVersion %> <%= prodversion %>

-

Ascensio System SIA

-

{{PUBLISHER_ADDRESS}}

-

{{SUPPORT_EMAIL}}

-

{{PUBLISHER_PHONE}}

-

<% print(/^(?:https?:\/{2})?(\S+)/.exec('{{PUBLISHER_URL}}')[1]); %>

+

<%= publishername %>

+

<%= publisheraddr %>

+

<%= supportemail %>

+

<%= phonenum %>

+

<%= printed_url %>

diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index dc9240246..e9986f8e3 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -92,7 +92,14 @@ define([ android: Common.SharedSettings.get('android'), phone: Common.SharedSettings.get('phone'), scope: this, - width: $(window).width() + width: $(window).width(), + prodversion: '{{PRODUCT_VERSION}}', + publishername: '{{PUBLISHER_NAME}}', + publisheraddr: '{{PUBLISHER_ADDRESS}}', + publisherurl: '{{PUBLISHER_URL}}', + printed_url: ("{{PUBLISHER_URL}}").replace(/https?:\/{2}/, "").replace(/\/$/,""), + supportemail: '{{SUPPORT_EMAIL}}', + phonenum: '{{PUBLISHER_PHONE}}' })); return this; diff --git a/apps/spreadsheeteditor/mobile/app/template/Settings.template b/apps/spreadsheeteditor/mobile/app/template/Settings.template index a87da9488..0852487a3 100644 --- a/apps/spreadsheeteditor/mobile/app/template/Settings.template +++ b/apps/spreadsheeteditor/mobile/app/template/Settings.template @@ -436,21 +436,21 @@

SPREADSHEET EDITOR

-

<%= scope.textVersion %> {{PRODUCT_VERSION}}

+

<%= scope.textVersion %> <%= prodversion %>

-

{{PUBLISHER_NAME}}

-

{{PUBLISHER_ADDRESS}}

-

{{SUPPORT_EMAIL}}

-

{{PUBLISHER_PHONE}}

-

<% print(/^(?:https?:\/{2})?(\S+)/.exec('{{PUBLISHER_URL}}')[1]); %>

+

<%= publishername %>

+

<%= publisheraddr %>

+

<%= supportemail %>

+

<%= phonenum %>

+

<%= printed_url %>

diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js index a385fcaaf..a8471525f 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -101,7 +101,14 @@ define([ xltx: Asc.c_oAscFileType.XLTX, ots: Asc.c_oAscFileType.OTS }, - width : $(window).width() + width : $(window).width(), + prodversion: '{{PRODUCT_VERSION}}', + publishername: '{{PUBLISHER_NAME}}', + publisheraddr: '{{PUBLISHER_ADDRESS}}', + publisherurl: '{{PUBLISHER_URL}}', + printed_url: ("{{PUBLISHER_URL}}").replace(/https?:\/{2}/, "").replace(/\/$/,""), + supportemail: '{{SUPPORT_EMAIL}}', + phonenum: '{{PUBLISHER_PHONE}}' })); return this; From 49078c01a649862ff2c3d99c042ec7f4eb42b743 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Aug 2019 16:48:10 +0300 Subject: [PATCH 11/12] Fix Bug 37251 --- .../main/app/controller/DocumentHolder.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/DocumentHolder.js b/apps/documenteditor/main/app/controller/DocumentHolder.js index 18f1a82d5..55f341fba 100644 --- a/apps/documenteditor/main/app/controller/DocumentHolder.js +++ b/apps/documenteditor/main/app/controller/DocumentHolder.js @@ -134,11 +134,14 @@ define([ } }, this)); diagramEditor.on('hide', _.bind(function(cmp, message) { - this.documentHolder.fireEvent('editcomplete', this.documentHolder); if (this.api) { this.api.asc_onCloseChartFrame(); this.api.asc_enableKeyEvents(true); } + var me = this; + setTimeout(function(){ + me.documentHolder.fireEvent('editcomplete', me.documentHolder); + }, 10); }, this)); } @@ -151,10 +154,13 @@ define([ this.api.asc_setMailMergeData(data); }, this)); mergeEditor.on('hide', _.bind(function(cmp, message) { - this.documentHolder.fireEvent('editcomplete', this.documentHolder); if (this.api) { this.api.asc_enableKeyEvents(true); } + var me = this; + setTimeout(function(){ + me.documentHolder.fireEvent('editcomplete', me.documentHolder); + }, 10); }, this)); } }, From bb22127a3e39a77f8914dd371dc5ae9342e4d630 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Aug 2019 17:22:28 +0300 Subject: [PATCH 12/12] [SSE] Spellcheck: search language by keydown --- apps/spreadsheeteditor/main/app/view/Spellcheck.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js index 33d879318..1d6a3ad83 100644 --- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js +++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js @@ -146,7 +146,8 @@ define([ cls : 'input-group-nr', scroller : { suppressScrollX: true - } + }, + search: true }); this.btnToDictionary = new Common.UI.Button({