From ce0b3120493187d1386d33a0ff58878dae7a8b40 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 7 Nov 2019 13:37:14 +0300 Subject: [PATCH 01/14] [PE] Move ListSettingsDialog to common --- .../main/lib}/view/ListSettingsDialog.js | 9 ++++++--- .../main/app/controller/Toolbar.js | 6 +++--- apps/presentationeditor/main/locale/en.json | 12 ++++++------ apps/presentationeditor/main/locale/ru.json | 10 +++++----- 4 files changed, 20 insertions(+), 17 deletions(-) rename apps/{presentationeditor/main/app => common/main/lib}/view/ListSettingsDialog.js (98%) diff --git a/apps/presentationeditor/main/app/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js similarity index 98% rename from apps/presentationeditor/main/app/view/ListSettingsDialog.js rename to apps/common/main/lib/view/ListSettingsDialog.js index ffde97be3..4c0cba823 100644 --- a/apps/presentationeditor/main/app/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -39,14 +39,17 @@ * */ +if (Common === undefined) + var Common = {}; + define([ - 'common/main/lib/component/Window', + '../component/Window', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/ThemeColorPalette', 'common/main/lib/component/ColorButton' ], function () { 'use strict'; - PE.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ + Common.Views.ListSettingsDialog = Common.UI.Window.extend(_.extend({ options: { type: 0, // 0 - markers, 1 - numbers width: 230, @@ -235,5 +238,5 @@ define([ txtOfText: '% of text', textNewColor: 'Add New Custom Color', txtStart: 'Start at' - }, PE.Views.ListSettingsDialog || {})) + }, Common.Views.ListSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 3b30b425a..54e414d37 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -48,6 +48,7 @@ define([ 'common/main/lib/view/ImageFromUrlDialog', 'common/main/lib/view/InsertTableDialog', 'common/main/lib/view/SelectFileDlg', + 'common/main/lib/view/ListSettingsDialog', 'common/main/lib/util/define', 'presentationeditor/main/app/collection/SlideThemes', 'presentationeditor/main/app/view/Toolbar', @@ -55,8 +56,7 @@ define([ 'presentationeditor/main/app/view/HeaderFooterDialog', 'presentationeditor/main/app/view/HyperlinkSettingsDialog', 'presentationeditor/main/app/view/SlideSizeSettings', - 'presentationeditor/main/app/view/SlideshowSettings', - 'presentationeditor/main/app/view/ListSettingsDialog' + 'presentationeditor/main/app/view/SlideshowSettings' ], function () { 'use strict'; PE.Controllers.Toolbar = Backbone.Controller.extend(_.extend({ @@ -1111,7 +1111,7 @@ define([ } } if (props) { - (new PE.Views.ListSettingsDialog({ + (new Common.Views.ListSettingsDialog({ props: props, type: type, handler: function(result, value) { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index bedcf8fbc..4fdf6ab78 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -108,6 +108,12 @@ "Common.Views.InsertTableDialog.txtTitle": "Table Size", "Common.Views.InsertTableDialog.txtTitleSplit": "Split Cell", "Common.Views.LanguageDialog.labelSelect": "Select document language", + "Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "Common.Views.ListSettingsDialog.txtColor": "Color", + "Common.Views.ListSettingsDialog.txtOfText": "% of text", + "Common.Views.ListSettingsDialog.txtSize": "Size", + "Common.Views.ListSettingsDialog.txtStart": "Start at", + "Common.Views.ListSettingsDialog.txtTitle": "List Settings", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtEncoding": "Encoding ", "Common.Views.OpenDialog.txtIncorrectPwd": "Password is incorrect.", @@ -1286,12 +1292,6 @@ "PE.Views.LeftMenu.tipTitles": "Titles", "PE.Views.LeftMenu.txtDeveloper": "DEVELOPER MODE", "PE.Views.LeftMenu.txtTrial": "TRIAL MODE", - "PE.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", - "PE.Views.ListSettingsDialog.txtColor": "Color", - "PE.Views.ListSettingsDialog.txtOfText": "% of text", - "PE.Views.ListSettingsDialog.txtSize": "Size", - "PE.Views.ListSettingsDialog.txtStart": "Start at", - "PE.Views.ListSettingsDialog.txtTitle": "List Settings", "PE.Views.ParagraphSettings.strLineHeight": "Line Spacing", "PE.Views.ParagraphSettings.strParagraphSpacing": "Paragraph Spacing", "PE.Views.ParagraphSettings.strSpacingAfter": "After", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 89f741143..60b5e5747 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -108,6 +108,11 @@ "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", "Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку", "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа", + "Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", + "Common.Views.ListSettingsDialog.txtColor": "Цвет", + "Common.Views.ListSettingsDialog.txtOfText": "% текста", + "Common.Views.ListSettingsDialog.txtSize": "Размер", + "Common.Views.ListSettingsDialog.txtTitle": "Параметры списка", "Common.Views.OpenDialog.closeButtonText": "Закрыть файл", "Common.Views.OpenDialog.txtEncoding": "Кодировка", "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.", @@ -1285,11 +1290,6 @@ "PE.Views.LeftMenu.tipTitles": "Заголовки", "PE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", "PE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ", - "PE.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", - "PE.Views.ListSettingsDialog.txtColor": "Цвет", - "PE.Views.ListSettingsDialog.txtOfText": "% текста", - "PE.Views.ListSettingsDialog.txtSize": "Размер", - "PE.Views.ListSettingsDialog.txtTitle": "Параметры списка", "PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", "PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "PE.Views.ParagraphSettings.strSpacingAfter": "После", From 71d7ac572b01440fa206de5d7ddf9ff21dc18f2c Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 7 Nov 2019 13:38:42 +0300 Subject: [PATCH 02/14] Fix ListSettingsDialog --- apps/common/main/lib/view/ListSettingsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 4c0cba823..f671b84d6 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -43,7 +43,7 @@ if (Common === undefined) var Common = {}; define([ - '../component/Window', + 'common/main/lib/component/Window', 'common/main/lib/component/MetricSpinner', 'common/main/lib/component/ThemeColorPalette', 'common/main/lib/component/ColorButton' From f79725ac7ad495b11039f3500ff13aa0957d1e8e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 7 Nov 2019 14:01:07 +0300 Subject: [PATCH 03/14] [SSE] Bug 43491 --- .../main/app/controller/DocumentHolder.js | 40 ++++++++++++++++--- .../main/app/view/DocumentHolder.js | 7 +++- apps/spreadsheeteditor/main/locale/en.json | 7 ++++ 3 files changed, 47 insertions(+), 7 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index bcb7a5225..6c332e45b 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -64,6 +64,7 @@ define([ 'common/main/lib/util/Shortcuts', 'common/main/lib/view/CopyWarningDialog', 'common/main/lib/view/OpenDialog', + 'common/main/lib/view/ListSettingsDialog', 'spreadsheeteditor/main/app/view/DocumentHolder', 'spreadsheeteditor/main/app/view/HyperlinkSettingsDialog', 'spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced', @@ -213,7 +214,7 @@ define([ view.menuImageAlign.menu.on('item:click', _.bind(me.onImgMenuAlign, me)); view.menuParagraphVAlign.menu.on('item:click', _.bind(me.onParagraphVAlign, me)); view.menuParagraphDirection.menu.on('item:click', _.bind(me.onParagraphDirection, me)); - view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectNoneBullet, me)); + view.menuParagraphBullets.menu.on('item:click', _.bind(me.onSelectBulletMenu, me)); view.menuAddHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me)); view.menuEditHyperlinkShape.on('click', _.bind(me.onInsHyperlink, me)); view.menuRemoveHyperlinkShape.on('click', _.bind(me.onRemoveHyperlinkShape, me)); @@ -744,11 +745,37 @@ define([ } }, - onSelectNoneBullet: function(menu, item) { - if (this.api && item.options.value == -1) { - this.api.asc_setListType(item.options.value); - Common.NotificationCenter.trigger('edit:complete', this.documentHolder); - Common.component.Analytics.trackEvent('DocumentHolder', 'List Type'); + onSelectBulletMenu: function(menu, item) { + if (this.api) { + if (item.options.value == -1) { + this.api.asc_setListType(item.options.value); + Common.NotificationCenter.trigger('edit:complete', this.documentHolder); + Common.component.Analytics.trackEvent('DocumentHolder', 'List Type'); + } else if (item.options.value == 'settings') { + var me = this, + props; + var selectedObjects = me.api.asc_getGraphicObjectProps(); + for (var i = 0; i < selectedObjects.length; i++) { + if (selectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Paragraph) { + props = selectedObjects[i].asc_getObjectValue(); + break; + } + } + if (props) { + (new Common.Views.ListSettingsDialog({ + props: props, + type: this.api.asc_getCurrentListType().get_ListType(), + handler: function(result, value) { + if (result == 'ok') { + if (me.api) { + me.api.asc_setGraphicObjectProps(value); + } + } + Common.NotificationCenter.trigger('edit:complete', me.documentHolder); + } + })).show(); + } + } } }, @@ -1645,6 +1672,7 @@ define([ documentHolder.menuParagraphDirect270.setChecked(direct == Asc.c_oAscVertDrawingText.vert270); documentHolder.menuParagraphBulletNone.setChecked(listtype.get_ListType() == -1); + documentHolder.mnuListSettings.setDisabled(listtype.get_ListType() == -1); var rec = documentHolder.paraBulletsPicker.store.findWhere({ type: listtype.get_ListType(), subtype: listtype.get_ListSubType() }); documentHolder.paraBulletsPicker.selectRecord(rec, true); } else if (elType == Asc.c_oAscTypeSelectElement.Paragraph) { diff --git a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js index 2a2d81402..481f98e1c 100644 --- a/apps/spreadsheeteditor/main/app/view/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/view/DocumentHolder.js @@ -836,6 +836,10 @@ define([ checkable : true, checked : false, value : -1 + }), + me.mnuListSettings = new Common.UI.MenuItem({ + caption: me.textListSettings, + value: 'settings' }) ] }) @@ -1090,7 +1094,8 @@ define([ textAlign: 'Align', textCrop: 'Crop', textCropFill: 'Fill', - textCropFit: 'Fit' + textCropFit: 'Fit', + textListSettings: 'List Settings' }, SSE.Views.DocumentHolder || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index b228e0117..abe6420c4 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -94,6 +94,12 @@ "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", + "Common.Views.ListSettingsDialog.textNewColor": "Add New Custom Color", + "Common.Views.ListSettingsDialog.txtColor": "Color", + "Common.Views.ListSettingsDialog.txtOfText": "% of text", + "Common.Views.ListSettingsDialog.txtSize": "Size", + "Common.Views.ListSettingsDialog.txtStart": "Start at", + "Common.Views.ListSettingsDialog.txtTitle": "List Settings", "Common.Views.OpenDialog.closeButtonText": "Close File", "Common.Views.OpenDialog.txtColon": "Colon", "Common.Views.OpenDialog.txtComma": "Comma", @@ -1495,6 +1501,7 @@ "SSE.Views.DocumentHolder.txtUngroup": "Ungroup", "SSE.Views.DocumentHolder.txtWidth": "Width", "SSE.Views.DocumentHolder.vertAlignText": "Vertical Alignment", + "SSE.Views.DocumentHolder.textListSettings": "List Settings", "SSE.Views.FileMenu.btnBackCaption": "Open file location", "SSE.Views.FileMenu.btnCloseMenuCaption": "Close Menu", "SSE.Views.FileMenu.btnCreateNewCaption": "Create New", From 54c0fda8fef8a7a227d5aeec10ff7168b0c4dcac Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 7 Nov 2019 18:49:33 +0300 Subject: [PATCH 04/14] Add allow autoplay attribute to editor iframe (for media plugins) --- apps/api/documents/api.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 8b9efb748..ee1428a8b 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -798,7 +798,8 @@ iframe.allowFullscreen = true; iframe.setAttribute("allowfullscreen",""); // for IE11 iframe.setAttribute("onmousewheel",""); // for Safari on Mac - + iframe.setAttribute("allow", "autoplay"); + if (config.type == "mobile") { iframe.style.position = "fixed"; From 2b4870ad0e491c9abb0fbee28adb3037bb5a16ef Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 8 Nov 2019 13:57:43 +0300 Subject: [PATCH 05/14] [SE] Fixed display grid placeholder on Safari --- apps/spreadsheeteditor/main/resources/less/app.less | 2 +- apps/spreadsheeteditor/mobile/resources/css/app-ios.css | 2 +- apps/spreadsheeteditor/mobile/resources/css/app-material.css | 2 +- apps/spreadsheeteditor/mobile/resources/less/app-ios.less | 2 +- apps/spreadsheeteditor/mobile/resources/less/app-material.less | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/spreadsheeteditor/main/resources/less/app.less b/apps/spreadsheeteditor/main/resources/less/app.less index 1f11e5e24..665d6f51e 100644 --- a/apps/spreadsheeteditor/main/resources/less/app.less +++ b/apps/spreadsheeteditor/main/resources/less/app.less @@ -164,7 +164,7 @@ height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css index fd37673e5..1c04dcd53 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-ios.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-ios.css @@ -7723,7 +7723,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { width: 100%; height: 100%; display: inline-block; - background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; + background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/spreadsheeteditor/mobile/resources/css/app-material.css b/apps/spreadsheeteditor/mobile/resources/css/app-material.css index 61264eaf2..db3b6425d 100644 --- a/apps/spreadsheeteditor/mobile/resources/css/app-material.css +++ b/apps/spreadsheeteditor/mobile/resources/css/app-material.css @@ -7585,7 +7585,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li { width: 100%; height: 100%; display: inline-block; - background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 255, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; + background: linear-gradient(90deg, #d5d5d5 0px, rgba(0, 0, 0, 0) 1px) 0 0, linear-gradient(rgba(0, 0, 0, 0) 19px, #d5d5d5 20px) 0 0, linear-gradient(#f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; -webkit-animation: flickerAnimation 2s infinite ease-in-out; -moz-animation: flickerAnimation 2s infinite ease-in-out; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less index c370b84f6..6f179bc31 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-ios.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-ios.less @@ -311,7 +311,7 @@ input, textarea { height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; diff --git a/apps/spreadsheeteditor/mobile/resources/less/app-material.less b/apps/spreadsheeteditor/mobile/resources/less/app-material.less index b69f06340..4cc126e86 100644 --- a/apps/spreadsheeteditor/mobile/resources/less/app-material.less +++ b/apps/spreadsheeteditor/mobile/resources/less/app-material.less @@ -299,7 +299,7 @@ input, textarea { height: 100%; display: inline-block; background: linear-gradient(90deg, #d5d5d5 0px, rgba(0,0,0,0) 1px) 0 0, - linear-gradient(rgba(0,255,0,0) 19px, #d5d5d5 20px) 0 0, + linear-gradient(rgba(0,0,0,0) 19px, #d5d5d5 20px) 0 0, linear-gradient( #f1f1f1 0px, #f1f1f1 20px) 0 0 repeat-x; background-size: 80px 20px; From a2f181711c4b495e15f6aeb60d99efbb21d6febd Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Fri, 8 Nov 2019 16:14:01 +0300 Subject: [PATCH 06/14] [DE] Hotfix display document placeholder --- apps/documenteditor/main/app/controller/Main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 7fc8b9c74..2d83a458a 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -366,6 +366,7 @@ define([ if (!( this.editorConfig.customization && ( this.editorConfig.customization.toolbarNoTabs || (this.editorConfig.targetApp!=='desktop') && (this.editorConfig.customization.loaderName || this.editorConfig.customization.loaderLogo)))) { + $('#editor-container').css('overflow', 'hidden'); $('#editor-container').append('
' + '
'.repeat(20) + '
'); } @@ -1055,6 +1056,7 @@ define([ $(document).on('contextmenu', _.bind(me.onContextMenu, me)); Common.Gateway.documentReady(); + $('#editor-container').css('overflow', ''); $('.doc-placeholder').remove(); }, From 5a82917bf4720d84a594d81a72dbffcbe550e80b Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 8 Nov 2019 17:13:38 +0300 Subject: [PATCH 07/14] [SSE] Bug 43429 --- apps/common/main/lib/component/TabBar.js | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/apps/common/main/lib/component/TabBar.js b/apps/common/main/lib/component/TabBar.js index baae6631d..44e58de0b 100644 --- a/apps/common/main/lib/component/TabBar.js +++ b/apps/common/main/lib/component/TabBar.js @@ -103,6 +103,8 @@ define([ var me = this, length = me.bar.tabs.length, barBounds = me.bar.$bar.get(0).getBoundingClientRect(); + me.leftBorder = barBounds.left; + me.rightBorder = barBounds.right; if (barBounds) { me.bounds = []; @@ -324,19 +326,30 @@ define([ function dragMove (event) { if (!_.isUndefined(me.drag)) { me.drag.moveX = event.clientX*Common.Utils.zoom(); - if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) { + if (me.drag.moveX < me.leftBorder) { + me.scrollLeft -= 20; + me.bar.$bar.scrollLeft(me.scrollLeft); + me.calculateBounds(); + } else if (me.drag.moveX < me.tabBarRight && me.drag.moveX > me.tabBarLeft) { var name = $(event.target).parent().data('label'), currentTab = _.findIndex(bar.tabs, {label: name}); - if (currentTab !== -1 && (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft)) { + if (currentTab === -1) { + bar.$el.find('li.mousemove').removeClass('mousemove right'); + me.drag.place = undefined; + } else if (me.bounds[currentTab].left - me.scrollLeft >= me.tabBarLeft) { me.drag.place = currentTab; $(event.target).parent().parent().find('li.mousemove').removeClass('mousemove right'); $(event.target).parent().addClass('mousemove'); } - } else if ((me.drag.moveX > me.lastTabRight - me.scrollLeft) && (me.tabBarRight >= me.lastTabRight - me.scrollLeft)) { //move to end of list, right border of the right tab is visible + } else if (me.drag.moveX > me.lastTabRight && Math.abs(me.tabBarRight - me.bounds[me.bar.tabs.length - 1].right) < 1) { //move to end of list, right border of the right tab is visible bar.$el.find('li.mousemove').removeClass('mousemove right'); bar.tabs[bar.tabs.length - 1].$el.addClass('mousemove right'); me.drag.place = bar.tabs.length; - } + } else if (me.drag.moveX - me.rightBorder > 3) { + me.scrollLeft += 20; + me.bar.$bar.scrollLeft(me.scrollLeft); + me.calculateBounds(); + } } } if (!_.isUndefined(bar) && !_.isUndefined(tabs) && bar.tabs.length > 1) { From f95093e23d3f9adc779610f8927e35cae28b9bfe Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 12 Nov 2019 11:49:43 +0300 Subject: [PATCH 08/14] Refactoring list settings --- apps/common/main/lib/view/ListSettingsDialog.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index f671b84d6..e0820cd4d 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -100,7 +100,7 @@ define([ this.spnSize = new Common.UI.MetricSpinner({ el : $window.find('#id-dlg-list-size'), step : 1, - width : 45, + width : 53, value : 100, defaultUnit : '', maxValue : 400, @@ -113,7 +113,7 @@ define([ }); this.btnColor = new Common.UI.ColorButton({ - style: "width:45px;", + style: "width:53px;", menu : new Common.UI.Menu({ additionalAlign: this.menuAddAlign, items: [ @@ -151,7 +151,7 @@ define([ this.spnStart = new Common.UI.MetricSpinner({ el : $window.find('#id-dlg-list-start'), step : 1, - width : 45, + width : 53, value : 1, defaultUnit : '', maxValue : 32767, From 9d648aed38d33fe13d7b623da344a929b3dc06e7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 12 Nov 2019 12:50:14 +0300 Subject: [PATCH 09/14] Update translation. Fix Bug 43513 --- apps/documenteditor/main/locale/ru.json | 8 ++++---- apps/documenteditor/mobile/locale/ru.json | 2 +- apps/presentationeditor/main/locale/ru.json | 16 ++++++++-------- apps/presentationeditor/mobile/locale/it.json | 13 ++++++++++++- apps/presentationeditor/mobile/locale/ru.json | 2 +- .../spreadsheeteditor/main/app/view/Statusbar.js | 10 +++++----- apps/spreadsheeteditor/main/locale/en.json | 10 +++++----- apps/spreadsheeteditor/main/locale/ru.json | 14 +++++++------- apps/spreadsheeteditor/mobile/locale/it.json | 11 ++++++++++- apps/spreadsheeteditor/mobile/locale/ru.json | 2 +- 10 files changed, 54 insertions(+), 34 deletions(-) diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json index e2ab5772e..800c93bea 100644 --- a/apps/documenteditor/main/locale/ru.json +++ b/apps/documenteditor/main/locale/ru.json @@ -1049,7 +1049,7 @@ "DE.Views.ChartSettings.textEditData": "Изменить данные", "DE.Views.ChartSettings.textHeight": "Высота", "DE.Views.ChartSettings.textLine": "График", - "DE.Views.ChartSettings.textOriginalSize": "По умолчанию", + "DE.Views.ChartSettings.textOriginalSize": "Реальный размер", "DE.Views.ChartSettings.textPie": "Круговая", "DE.Views.ChartSettings.textPoint": "Точечная", "DE.Views.ChartSettings.textSize": "Размер", @@ -1131,7 +1131,7 @@ "DE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки", "DE.Views.DocumentHolder.moreText": "Больше вариантов...", "DE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов", - "DE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию", + "DE.Views.DocumentHolder.originalSizeText": "Реальный размер", "DE.Views.DocumentHolder.paragraphText": "Абзац", "DE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "DE.Views.DocumentHolder.rightText": "По правому краю", @@ -1491,7 +1491,7 @@ "DE.Views.ImageSettings.textHintFlipH": "Отразить слева направо", "DE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "DE.Views.ImageSettings.textInsert": "Заменить изображение", - "DE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "DE.Views.ImageSettings.textOriginalSize": "Реальный размер", "DE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "DE.Views.ImageSettings.textRotation": "Поворот", "DE.Views.ImageSettings.textSize": "Размер", @@ -1543,7 +1543,7 @@ "DE.Views.ImageSettingsAdvanced.textMiter": "Прямой", "DE.Views.ImageSettingsAdvanced.textMove": "Перемещать с текстом", "DE.Views.ImageSettingsAdvanced.textOptions": "Параметры", - "DE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию", + "DE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер", "DE.Views.ImageSettingsAdvanced.textOverlap": "Разрешить перекрытие", "DE.Views.ImageSettingsAdvanced.textPage": "Страницы", "DE.Views.ImageSettingsAdvanced.textParagraph": "Абзаца", diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 6fa5b1bf2..efc4828fd 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -337,7 +337,7 @@ "DE.Views.EditImage.textBack": "Назад", "DE.Views.EditImage.textBackward": "Перенести назад", "DE.Views.EditImage.textBehind": "За текстом", - "DE.Views.EditImage.textDefault": "Размер по умолчанию", + "DE.Views.EditImage.textDefault": "Реальный размер", "DE.Views.EditImage.textDistanceText": "Расстояние до текста", "DE.Views.EditImage.textForward": "Перенести вперед", "DE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index 60b5e5747..d67275680 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -108,11 +108,6 @@ "Common.Views.InsertTableDialog.txtTitle": "Размер таблицы", "Common.Views.InsertTableDialog.txtTitleSplit": "Разделить ячейку", "Common.Views.LanguageDialog.labelSelect": "Выбрать язык документа", - "Common.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", - "Common.Views.ListSettingsDialog.txtColor": "Цвет", - "Common.Views.ListSettingsDialog.txtOfText": "% текста", - "Common.Views.ListSettingsDialog.txtSize": "Размер", - "Common.Views.ListSettingsDialog.txtTitle": "Параметры списка", "Common.Views.OpenDialog.closeButtonText": "Закрыть файл", "Common.Views.OpenDialog.txtEncoding": "Кодировка", "Common.Views.OpenDialog.txtIncorrectPwd": "Указан неверный пароль.", @@ -974,7 +969,7 @@ "PE.Views.DocumentHolder.mergeCellsText": "Объединить ячейки", "PE.Views.DocumentHolder.moreText": "Больше вариантов...", "PE.Views.DocumentHolder.noSpellVariantsText": "Нет вариантов", - "PE.Views.DocumentHolder.originalSizeText": "Размер по умолчанию", + "PE.Views.DocumentHolder.originalSizeText": "Реальный размер", "PE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "PE.Views.DocumentHolder.rightText": "По правому краю", "PE.Views.DocumentHolder.rowText": "Строку", @@ -1258,7 +1253,7 @@ "PE.Views.ImageSettings.textHintFlipH": "Отразить слева направо", "PE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "PE.Views.ImageSettings.textInsert": "Заменить изображение", - "PE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "PE.Views.ImageSettings.textOriginalSize": "Реальный размер", "PE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "PE.Views.ImageSettings.textRotation": "Поворот", "PE.Views.ImageSettings.textSize": "Размер", @@ -1272,7 +1267,7 @@ "PE.Views.ImageSettingsAdvanced.textHeight": "Высота", "PE.Views.ImageSettingsAdvanced.textHorizontally": "По горизонтали", "PE.Views.ImageSettingsAdvanced.textKeepRatio": "Сохранять пропорции", - "PE.Views.ImageSettingsAdvanced.textOriginalSize": "По умолчанию", + "PE.Views.ImageSettingsAdvanced.textOriginalSize": "Реальный размер", "PE.Views.ImageSettingsAdvanced.textPlacement": "Положение", "PE.Views.ImageSettingsAdvanced.textPosition": "Положение", "PE.Views.ImageSettingsAdvanced.textRotation": "Поворот", @@ -1290,6 +1285,11 @@ "PE.Views.LeftMenu.tipTitles": "Заголовки", "PE.Views.LeftMenu.txtDeveloper": "РЕЖИМ РАЗРАБОТЧИКА", "PE.Views.LeftMenu.txtTrial": "ПРОБНЫЙ РЕЖИМ", + "PE.Views.ListSettingsDialog.textNewColor": "Пользовательский цвет", + "PE.Views.ListSettingsDialog.txtColor": "Цвет", + "PE.Views.ListSettingsDialog.txtOfText": "% текста", + "PE.Views.ListSettingsDialog.txtSize": "Размер", + "PE.Views.ListSettingsDialog.txtTitle": "Параметры списка", "PE.Views.ParagraphSettings.strLineHeight": "Междустрочный интервал", "PE.Views.ParagraphSettings.strParagraphSpacing": "Интервал между абзацами", "PE.Views.ParagraphSettings.strSpacingAfter": "После", diff --git a/apps/presentationeditor/mobile/locale/it.json b/apps/presentationeditor/mobile/locale/it.json index 20d98e0ba..fb451474a 100644 --- a/apps/presentationeditor/mobile/locale/it.json +++ b/apps/presentationeditor/mobile/locale/it.json @@ -1,5 +1,6 @@ { "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", + "Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", @@ -253,6 +254,7 @@ "PE.Views.AddLink.textNumber": "Numero Diapositiva", "PE.Views.AddLink.textPrev": "Diapositiva precedente", "PE.Views.AddLink.textTip": "Suggerimento ", + "PE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditChart.textAlign": "Allinea", "PE.Views.EditChart.textAlignBottom": "Allinea in basso", "PE.Views.EditChart.textAlignCenter": "Allinea al centro", @@ -264,6 +266,7 @@ "PE.Views.EditChart.textBackward": "Sposta indietro", "PE.Views.EditChart.textBorder": "Bordo", "PE.Views.EditChart.textColor": "Colore", + "PE.Views.EditChart.textCustomColor": "Colore personalizzato", "PE.Views.EditChart.textFill": "Riempimento", "PE.Views.EditChart.textForward": "Sposta avanti", "PE.Views.EditChart.textRemoveChart": "Elimina Grafico", @@ -285,7 +288,7 @@ "PE.Views.EditImage.textAlignTop": "Allinea in alto", "PE.Views.EditImage.textBack": "Indietro", "PE.Views.EditImage.textBackward": "Sposta indietro", - "PE.Views.EditImage.textDefault": "Dimensione predefinita", + "PE.Views.EditImage.textDefault": "Dimensione reale", "PE.Views.EditImage.textForward": "Sposta avanti", "PE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta", "PE.Views.EditImage.textFromURL": "Immagine da URL", @@ -314,6 +317,7 @@ "PE.Views.EditLink.textPrev": "Diapositiva precedente", "PE.Views.EditLink.textRemove": "Elimina Collegamento", "PE.Views.EditLink.textTip": "Suggerimento ", + "PE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditShape.textAlign": "Allinea", "PE.Views.EditShape.textAlignBottom": "Allinea in basso", "PE.Views.EditShape.textAlignCenter": "Allinea al centro", @@ -325,6 +329,7 @@ "PE.Views.EditShape.textBackward": "Sposta indietro", "PE.Views.EditShape.textBorder": "Bordo", "PE.Views.EditShape.textColor": "Colore", + "PE.Views.EditShape.textCustomColor": "Colore personalizzato", "PE.Views.EditShape.textEffects": "Effetti", "PE.Views.EditShape.textFill": "Riempimento", "PE.Views.EditShape.textForward": "Sposta avanti", @@ -338,6 +343,7 @@ "PE.Views.EditShape.textToForeground": "Porta in primo piano", "PE.Views.EditShape.txtDistribHor": "Distribuisci orizzontalmente", "PE.Views.EditShape.txtDistribVert": "Distribuisci verticalmente", + "PE.Views.EditSlide.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditSlide.textApplyAll": "Applica a tutte le diapositive", "PE.Views.EditSlide.textBack": "Indietro", "PE.Views.EditSlide.textBlack": "Attraverso il nero", @@ -349,6 +355,7 @@ "PE.Views.EditSlide.textColor": "Colore", "PE.Views.EditSlide.textCounterclockwise": "In senso antiorario", "PE.Views.EditSlide.textCover": "Copertina", + "PE.Views.EditSlide.textCustomColor": "Colore personalizzato", "PE.Views.EditSlide.textDelay": "Ritardo", "PE.Views.EditSlide.textDuplicateSlide": "Duplica diapositiva", "PE.Views.EditSlide.textDuration": "Durata", @@ -383,6 +390,7 @@ "PE.Views.EditSlide.textZoomIn": "Ingrandisci", "PE.Views.EditSlide.textZoomOut": "Rimpicciolisci", "PE.Views.EditSlide.textZoomRotate": "Zoom e rotazione", + "PE.Views.EditTable.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditTable.textAlign": "Allinea", "PE.Views.EditTable.textAlignBottom": "Allinea in basso", "PE.Views.EditTable.textAlignCenter": "Allinea al centro", @@ -397,6 +405,7 @@ "PE.Views.EditTable.textBorder": "Bordo", "PE.Views.EditTable.textCellMargins": "Margini cella", "PE.Views.EditTable.textColor": "Colore", + "PE.Views.EditTable.textCustomColor": "Colore personalizzato", "PE.Views.EditTable.textFill": "Riempimento", "PE.Views.EditTable.textFirstColumn": "Prima colonna", "PE.Views.EditTable.textForward": "Sposta avanti", @@ -414,6 +423,7 @@ "PE.Views.EditTable.textTotalRow": "Riga del Totale", "PE.Views.EditTable.txtDistribHor": "Distribuisci orizzontalmente", "PE.Views.EditTable.txtDistribVert": "Distribuisci verticalmente", + "PE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato", "PE.Views.EditText.textAdditional": "Più...", "PE.Views.EditText.textAdditionalFormat": "Formattazione aggiuntiva", "PE.Views.EditText.textAfter": "dopo", @@ -426,6 +436,7 @@ "PE.Views.EditText.textCharacterItalic": "I", "PE.Views.EditText.textCharacterStrikethrough": "S", "PE.Views.EditText.textCharacterUnderline": "U", + "PE.Views.EditText.textCustomColor": "Colore personalizzato", "PE.Views.EditText.textDblStrikethrough": "Barrato doppio", "PE.Views.EditText.textDblSuperscript": "Apice", "PE.Views.EditText.textFontColor": "Colore del carattere", diff --git a/apps/presentationeditor/mobile/locale/ru.json b/apps/presentationeditor/mobile/locale/ru.json index f53721ea4..63e24f085 100644 --- a/apps/presentationeditor/mobile/locale/ru.json +++ b/apps/presentationeditor/mobile/locale/ru.json @@ -288,7 +288,7 @@ "PE.Views.EditImage.textAlignTop": "По верхнему краю", "PE.Views.EditImage.textBack": "Назад", "PE.Views.EditImage.textBackward": "Перенести назад", - "PE.Views.EditImage.textDefault": "Размер по умолчанию", + "PE.Views.EditImage.textDefault": "Реальный размер", "PE.Views.EditImage.textForward": "Перенести вперед", "PE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", "PE.Views.EditImage.textFromURL": "Изображение по URL", diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 6b87e85dc..0d50e0bfc 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -571,11 +571,11 @@ define([ textNoColor : 'No Color', textNewColor : 'Add New Custom Color', zoomText : 'Zoom {0}%', - textSum : 'SUM', - textCount : 'COUNT', - textAverage : 'AVERAGE', - textMin : 'MIN', - textMax : 'MAX', + textSum : 'Sum', + textCount : 'Count', + textAverage : 'Average', + textMin : 'Min', + textMax : 'Max', filteredRecordsText : '{0} of {1} records filtered', filteredText : 'Filter mode', selectAllSheets : 'Select All Sheets', diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index abe6420c4..32b86960b 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -2093,13 +2093,13 @@ "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "A sheet name cannot contain the following characters: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Sheet Name", "SSE.Views.Statusbar.selectAllSheets": "Select All Sheets", - "SSE.Views.Statusbar.textAverage": "AVERAGE", - "SSE.Views.Statusbar.textCount": "COUNT", - "SSE.Views.Statusbar.textMax": "MAX", - "SSE.Views.Statusbar.textMin": "MIN", + "SSE.Views.Statusbar.textAverage": "Average", + "SSE.Views.Statusbar.textCount": "Count", + "SSE.Views.Statusbar.textMax": "Max", + "SSE.Views.Statusbar.textMin": "Min", "SSE.Views.Statusbar.textNewColor": "Add New Custom Color", "SSE.Views.Statusbar.textNoColor": "No Color", - "SSE.Views.Statusbar.textSum": "SUM", + "SSE.Views.Statusbar.textSum": "Sum", "SSE.Views.Statusbar.tipAddTab": "Add worksheet", "SSE.Views.Statusbar.tipFirst": "Scroll to first sheet", "SSE.Views.Statusbar.tipLast": "Scroll to last sheet", diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index cf522bc6a..f3aab8134 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1391,7 +1391,7 @@ "SSE.Views.DocumentHolder.insertColumnRightText": "Столбец справа", "SSE.Views.DocumentHolder.insertRowAboveText": "Строку выше", "SSE.Views.DocumentHolder.insertRowBelowText": "Строку ниже", - "SSE.Views.DocumentHolder.originalSizeText": "По умолчанию", + "SSE.Views.DocumentHolder.originalSizeText": "Реальный размер", "SSE.Views.DocumentHolder.removeHyperlinkText": "Удалить гиперссылку", "SSE.Views.DocumentHolder.selectColumnText": "Весь столбец", "SSE.Views.DocumentHolder.selectDataText": "Данные столбцов", @@ -1702,7 +1702,7 @@ "SSE.Views.ImageSettings.textHintFlipV": "Отразить сверху вниз", "SSE.Views.ImageSettings.textInsert": "Заменить изображение", "SSE.Views.ImageSettings.textKeepRatio": "Сохранять пропорции", - "SSE.Views.ImageSettings.textOriginalSize": "По умолчанию", + "SSE.Views.ImageSettings.textOriginalSize": "Реальный размер", "SSE.Views.ImageSettings.textRotate90": "Повернуть на 90°", "SSE.Views.ImageSettings.textRotation": "Поворот", "SSE.Views.ImageSettings.textSize": "Размер", @@ -2086,13 +2086,13 @@ "SSE.Views.Statusbar.RenameDialog.errNameWrongChar": "Имя листа не может содержать следующие символы: \\/*?[]:", "SSE.Views.Statusbar.RenameDialog.labelSheetName": "Имя листа", "SSE.Views.Statusbar.selectAllSheets": "Выбрать все листы", - "SSE.Views.Statusbar.textAverage": "СРЕДНЕЕ", - "SSE.Views.Statusbar.textCount": "КОЛИЧЕСТВО", - "SSE.Views.Statusbar.textMax": "МАКС", - "SSE.Views.Statusbar.textMin": "МИН", + "SSE.Views.Statusbar.textAverage": "Среднее", + "SSE.Views.Statusbar.textCount": "Количество", + "SSE.Views.Statusbar.textMax": "Макс", + "SSE.Views.Statusbar.textMin": "Мин", "SSE.Views.Statusbar.textNewColor": "Пользовательский цвет", "SSE.Views.Statusbar.textNoColor": "Без цвета", - "SSE.Views.Statusbar.textSum": "СУММА", + "SSE.Views.Statusbar.textSum": "Сумма", "SSE.Views.Statusbar.tipAddTab": "Добавить лист", "SSE.Views.Statusbar.tipFirst": "Прокрутить до первого листа", "SSE.Views.Statusbar.tipLast": "Прокрутить до последнего листа", diff --git a/apps/spreadsheeteditor/mobile/locale/it.json b/apps/spreadsheeteditor/mobile/locale/it.json index 3a781a874..5a254956d 100644 --- a/apps/spreadsheeteditor/mobile/locale/it.json +++ b/apps/spreadsheeteditor/mobile/locale/it.json @@ -1,5 +1,6 @@ { "Common.Controllers.Collaboration.textEditUser": "È in corso la modifica del documento da parte di più utenti.", + "Common.UI.ThemeColorPalette.textCustomColors": "Colori personalizzati", "Common.UI.ThemeColorPalette.textStandartColors": "Colori standard", "Common.UI.ThemeColorPalette.textThemeColors": "Colori del tema", "Common.Utils.Metric.txtCm": "cm", @@ -346,6 +347,7 @@ "SSE.Views.AddOther.textLink": "Collegamento", "SSE.Views.AddOther.textSort": "Ordina e filtra", "SSE.Views.EditCell.textAccounting": "Contabilità", + "SSE.Views.EditCell.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditCell.textAlignBottom": "Allinea in basso", "SSE.Views.EditCell.textAlignCenter": "Allinea al centro", "SSE.Views.EditCell.textAlignLeft": "Allinea a sinistra", @@ -362,6 +364,7 @@ "SSE.Views.EditCell.textCharacterUnderline": "U", "SSE.Views.EditCell.textColor": "Colore", "SSE.Views.EditCell.textCurrency": "Valuta", + "SSE.Views.EditCell.textCustomColor": "Colore personalizzato", "SSE.Views.EditCell.textDate": "Data", "SSE.Views.EditCell.textDiagDownBorder": "Bordo diagonale inferiore", "SSE.Views.EditCell.textDiagUpBorder": "Bordo diagonale superiore", @@ -395,6 +398,7 @@ "SSE.Views.EditCell.textTopBorder": "Bordo superiore", "SSE.Views.EditCell.textWrapText": "Disponi testo", "SSE.Views.EditCell.textYen": "Yen", + "SSE.Views.EditChart.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditChart.textAuto": "Auto", "SSE.Views.EditChart.textAxisCrosses": "Intersezione asse", "SSE.Views.EditChart.textAxisOptions": "Opzioni assi", @@ -408,6 +412,7 @@ "SSE.Views.EditChart.textChartTitle": "Titolo del grafico", "SSE.Views.EditChart.textColor": "Colore", "SSE.Views.EditChart.textCrossesValue": "Incrocia valore", + "SSE.Views.EditChart.textCustomColor": "Colore personalizzato", "SSE.Views.EditChart.textDataLabels": "Etichette dati", "SSE.Views.EditChart.textDesign": "Design", "SSE.Views.EditChart.textDisplayUnits": "Mostra unità", @@ -461,7 +466,7 @@ "SSE.Views.EditImage.textAddress": "Indirizzo", "SSE.Views.EditImage.textBack": "Indietro", "SSE.Views.EditImage.textBackward": "Sposta indietro", - "SSE.Views.EditImage.textDefault": "Dimensione predefinita", + "SSE.Views.EditImage.textDefault": "Dimensione reale", "SSE.Views.EditImage.textForward": "Sposta avanti", "SSE.Views.EditImage.textFromLibrary": "Foto dalla Raccolta", "SSE.Views.EditImage.textFromURL": "Immagine da URL", @@ -473,10 +478,12 @@ "SSE.Views.EditImage.textReplaceImg": "Sostituisci immagine", "SSE.Views.EditImage.textToBackground": "Porta in secondo piano", "SSE.Views.EditImage.textToForeground": "Porta in primo piano", + "SSE.Views.EditShape.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditShape.textBack": "Indietro", "SSE.Views.EditShape.textBackward": "Sposta indietro", "SSE.Views.EditShape.textBorder": "Bordo", "SSE.Views.EditShape.textColor": "Colore", + "SSE.Views.EditShape.textCustomColor": "Colore personalizzato", "SSE.Views.EditShape.textEffects": "Effetti", "SSE.Views.EditShape.textFill": "Riempimento", "SSE.Views.EditShape.textForward": "Sposta avanti", @@ -488,10 +495,12 @@ "SSE.Views.EditShape.textStyle": "Stile", "SSE.Views.EditShape.textToBackground": "Porta in secondo piano", "SSE.Views.EditShape.textToForeground": "Porta in primo piano", + "SSE.Views.EditText.textAddCustomColor": "Aggiungi colore personalizzato", "SSE.Views.EditText.textBack": "Indietro", "SSE.Views.EditText.textCharacterBold": "B", "SSE.Views.EditText.textCharacterItalic": "I", "SSE.Views.EditText.textCharacterUnderline": "U", + "SSE.Views.EditText.textCustomColor": "Colore personalizzato", "SSE.Views.EditText.textFillColor": "Colore di riempimento", "SSE.Views.EditText.textFonts": "Caratteri", "SSE.Views.EditText.textSize": "Dimensione", diff --git a/apps/spreadsheeteditor/mobile/locale/ru.json b/apps/spreadsheeteditor/mobile/locale/ru.json index 0c3be62c3..d66a071ac 100644 --- a/apps/spreadsheeteditor/mobile/locale/ru.json +++ b/apps/spreadsheeteditor/mobile/locale/ru.json @@ -466,7 +466,7 @@ "SSE.Views.EditImage.textAddress": "Адрес", "SSE.Views.EditImage.textBack": "Назад", "SSE.Views.EditImage.textBackward": "Перенести назад", - "SSE.Views.EditImage.textDefault": "Размер по умолчанию", + "SSE.Views.EditImage.textDefault": "Реальный размер", "SSE.Views.EditImage.textForward": "Перенести вперед", "SSE.Views.EditImage.textFromLibrary": "Изображение из библиотеки", "SSE.Views.EditImage.textFromURL": "Изображение по URL", From 4da1651f5d46065640e15704158c07f41f42e631 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 13 Nov 2019 11:29:49 +0300 Subject: [PATCH 10/14] [SSE] Fix bug 43524 --- .../main/app/view/CellSettings.js | 485 ++++++++++-------- 1 file changed, 272 insertions(+), 213 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/view/CellSettings.js b/apps/spreadsheeteditor/main/app/view/CellSettings.js index 483d0f9ed..2c41c3736 100644 --- a/apps/spreadsheeteditor/main/app/view/CellSettings.js +++ b/apps/spreadsheeteditor/main/app/view/CellSettings.js @@ -401,261 +401,320 @@ define([ this.disableControls(this._locked); - if (props ) - { + if (props ) { this._noApply = true; var value = props.asc_getAngle(); - if ( Math.abs(this._state.CellAngle-value)>0.1 || (this._state.CellAngle===undefined)&&(this._state.CellAngle!==value)) { + if (Math.abs(this._state.CellAngle - value) > 0.1 || (this._state.CellAngle === undefined) && (this._state.CellAngle !== value)) { this.spnAngle.setValue((value !== null) ? value : '', true); - this._state.CellAngle=value; + this._state.CellAngle = value; } this.fill = props.asc_getFill2(); - this.pattern = this.fill.asc_getPatternFill(); - this.gradient = this.fill.asc_getGradientFill(); - if (this.pattern === null && this.gradient === null) { - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; - this.CellColor = {Value: 0, Color: 'transparent'}; - this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - this.BGColor = {Value: 1, Color: 'ffffff'}; - this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0}; - this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - } else if (this.pattern !== null) { - if(this.pattern.asc_getType() === -1) { - var color = this.pattern.asc_getFgColor(); - if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.CellColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; - } else { - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; - } - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color)}; + if (this.fill) { + this.pattern = this.fill.asc_getPatternFill(); + this.gradient = this.fill.asc_getGradientFill(); + if (this.pattern === null && this.gradient === null) { + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_NOFILL; + this.CellColor = {Value: 0, Color: 'transparent'}; + this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; this.BGColor = {Value: 1, Color: 'ffffff'}; - this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), Position: 0}; + this.GradColors[0] = {Value: 1, Color: {color: '4f81bd', effectId: 24}, Position: 0}; this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - } else { - this.PatternFillType = this.pattern.asc_getType(); - if (this._state.PatternFillType !== this.PatternFillType) { - this.cmbPattern.suspendEvents(); - var rec = this.cmbPattern.menuPicker.store.findWhere({ - type: this.PatternFillType - }); - this.cmbPattern.menuPicker.selectRecord(rec); - this.cmbPattern.resumeEvents(); - this._state.PatternFillType = this.PatternFillType; - } - var color = this.pattern.asc_getFgColor(); - if (color) { + } else if (this.pattern !== null) { + if (this.pattern.asc_getType() === -1) { + var color = this.pattern.asc_getFgColor(); if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.FGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; + this.CellColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; } else { - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; } - } else - this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - - color = this.pattern.asc_getBgColor(); - if (color) { - if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - this.BGColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), effectValue: color.asc_getValue() }}; - } else { - this.BGColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB())}; - } - } else + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_SOLID; + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color) + }; this.BGColor = {Value: 1, Color: 'ffffff'}; - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color)}; - this.GradColors[0] = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), Position: 0}; - this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; - } - } else if (this.gradient !== null) { - var gradFillType = this.gradient.asc_getType(); - if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) { - this.GradFillType = gradFillType; - rec = undefined; - if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { - this.cmbGradType.setValue(this.GradFillType); - rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); - this.onGradTypeSelect(this.cmbGradType, rec.attributes); + this.GradColors[0] = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.CellColor.Color), + Position: 0 + }; + this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; } else { - this.cmbGradType.setValue(''); - this.btnDirection.setIconCls(''); + this.PatternFillType = this.pattern.asc_getType(); + if (this._state.PatternFillType !== this.PatternFillType) { + this.cmbPattern.suspendEvents(); + var rec = this.cmbPattern.menuPicker.store.findWhere({ + type: this.PatternFillType + }); + this.cmbPattern.menuPicker.selectRecord(rec); + this.cmbPattern.resumeEvents(); + this._state.PatternFillType = this.PatternFillType; + } + var color = this.pattern.asc_getFgColor(); + if (color) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + this.FGColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; + } else { + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; + } + } else + this.FGColor = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; + + color = this.pattern.asc_getBgColor(); + if (color) { + if (color.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + this.BGColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()), + effectValue: color.asc_getValue() + } + }; + } else { + this.BGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(color.asc_getR(), color.asc_getG(), color.asc_getB()) + }; + } + } else + this.BGColor = {Value: 1, Color: 'ffffff'}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color) + }; + this.GradColors[0] = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.FGColor.Color), + Position: 0 + }; + this.GradColors[1] = {Value: 1, Color: 'ffffff', Position: 1}; + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_PATT; } - this._state.GradFillType = this.GradFillType; - } - if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { - var value = this.gradient.asc_getDegree(); - if (Math.abs(this.GradLinearDirectionType-value)>0.001) { - this.GradLinearDirectionType=value; - var record = this.mnuDirectionPicker.store.findWhere({type: value}); - this.mnuDirectionPicker.selectRecord(record, true); - if (record) - this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); - else + } else if (this.gradient !== null) { + var gradFillType = this.gradient.asc_getType(); + if (this._state.GradFillType !== gradFillType || this.GradFillType !== gradFillType) { + this.GradFillType = gradFillType; + rec = undefined; + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR || this.GradFillType == Asc.c_oAscFillGradType.GRAD_PATH) { + this.cmbGradType.setValue(this.GradFillType); + rec = this.cmbGradType.store.findWhere({value: this.GradFillType}); + this.onGradTypeSelect(this.cmbGradType, rec.attributes); + } else { + this.cmbGradType.setValue(''); this.btnDirection.setIconCls(''); + } + this._state.GradFillType = this.GradFillType; } + if (this.GradFillType == Asc.c_oAscFillGradType.GRAD_LINEAR) { + var value = this.gradient.asc_getDegree(); + if (Math.abs(this.GradLinearDirectionType - value) > 0.001) { + this.GradLinearDirectionType = value; + var record = this.mnuDirectionPicker.store.findWhere({type: value}); + this.mnuDirectionPicker.selectRecord(record, true); + if (record) + this.btnDirection.setIconCls('item-gradient ' + record.get('iconcls')); + else + this.btnDirection.setIconCls(''); + } + } + + var gradientStops; + this.GradColors.length = 0; + gradientStops = this.gradient.asc_getGradientStops(); + gradientStops.forEach(function (color) { + var clr = color.asc_getColor(), + position = color.asc_getPosition(), + itemColor; + if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { + itemColor = { + Value: 1, + Color: { + color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), + effectValue: clr.asc_getValue() + }, + Position: position + }; + } else { + itemColor = { + Value: 1, + Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), + Position: position + }; + } + me.GradColors.push(itemColor); + }); + this.GradColors = _.sortBy(this.GradColors, 'Position'); + + this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; + this.FGColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color) + }; + this.BGColor = {Value: 1, Color: 'ffffff'}; + this.CellColor = { + Value: 1, + Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color) + }; } - var gradientStops; - this.GradColors.length = 0; - gradientStops = this.gradient.asc_getGradientStops(); - gradientStops.forEach(function (color) { - var clr = color.asc_getColor(), - position = color.asc_getPosition(), - itemColor; - if (clr.asc_getType() == Asc.c_oAscColor.COLOR_TYPE_SCHEME) { - itemColor = {Value: 1, Color: {color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), effectValue: clr.asc_getValue()}, Position: position}; + if (this._state.FillType !== this.OriginalFillType) { + this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType); + this._state.FillType = this.OriginalFillType; + this.ShowHideElem(this.OriginalFillType); + } + + // Color Back + + var type1 = typeof (this.CellColor.Color), + type2 = typeof (this._state.CellColor); + if ((type1 !== type2) || (type1 == 'object' && + (this.CellColor.Color.effectValue !== this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color) < 0)) || + (type1 != 'object' && this._state.CellColor !== undefined && this._state.CellColor.indexOf(this.CellColor.Color) < 0)) { + + this.btnBackColor.setColor(this.CellColor.Color); + if (_.isObject(this.CellColor.Color)) { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) { + this.colorsBack.select(this.CellColor.Color, true); + isselected = true; + break; + } + } + if (!isselected) this.colorsBack.clearSelection(); } else { - itemColor = {Value: 1, Color: Common.Utils.ThemeColor.getHexColor(clr.asc_getR(), clr.asc_getG(), clr.asc_getB()), Position: position}; + this.colorsBack.select(this.CellColor.Color, true); } - me.GradColors.push(itemColor); - }); - this.GradColors = _.sortBy(this.GradColors, 'Position'); - - this.OriginalFillType = Asc.c_oAscFill.FILL_TYPE_GRAD; - this.FGColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)}; - this.BGColor = {Value: 1, Color: 'ffffff'}; - this.CellColor = {Value: 1, Color: Common.Utils.ThemeColor.colorValue2EffectId(this.GradColors[0].Color)}; - } - - if ( this._state.FillType !== this.OriginalFillType ) { - this.cmbFillSrc.setValue((this.OriginalFillType === null) ? '' : this.OriginalFillType); - this._state.FillType = this.OriginalFillType; - this.ShowHideElem(this.OriginalFillType); - } - - // Color Back - - var type1 = typeof(this.CellColor.Color), - type2 = typeof(this._state.CellColor); - if ( (type1 !== type2) || (type1=='object' && - (this.CellColor.Color.effectValue!==this._state.CellColor.effectValue || this._state.CellColor.color.indexOf(this.CellColor.Color)<0)) || - (type1!='object' && this._state.CellColor!==undefined && this._state.CellColor.indexOf(this.CellColor.Color)<0 )) { - - this.btnBackColor.setColor(this.CellColor.Color); - if (_.isObject(this.CellColor.Color)) { - var isselected = false; - for (var i = 0; i < 10; i++) { - if (Common.Utils.ThemeColor.ThemeValues[i] == this.CellColor.Color.effectValue) { - this.colorsBack.select(this.CellColor.Color,true); - isselected = true; - break; - } - } - if (!isselected) this.colorsBack.clearSelection(); - } else { - this.colorsBack.select(this.CellColor.Color, true); + this._state.CellColor = this.CellColor.Color; } - this._state.CellColor = this.CellColor.Color; - } - // Pattern colors - type1 = typeof(this.FGColor.Color); - type2 = typeof(this._state.FGColor); + // Pattern colors + type1 = typeof (this.FGColor.Color); + type2 = typeof (this._state.FGColor); - if ( (type1 !== type2) || (type1=='object' && - (this.FGColor.Color.effectValue!==this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color)<0)) || - (type1!='object' && this._state.FGColor.indexOf(this.FGColor.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (this.FGColor.Color.effectValue !== this._state.FGColor.effectValue || this._state.FGColor.color.indexOf(this.FGColor.Color.color) < 0)) || + (type1 != 'object' && this._state.FGColor.indexOf(this.FGColor.Color) < 0)) { - this.btnFGColor.setColor(this.FGColor.Color); - if ( typeof(this.FGColor.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue ) { - this.colorsFG.select(this.FGColor.Color,true); - isselected = true; - break; + this.btnFGColor.setColor(this.FGColor.Color); + if (typeof (this.FGColor.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.FGColor.Color.effectValue) { + this.colorsFG.select(this.FGColor.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsFG.clearSelection(); - } else - this.colorsFG.select(this.FGColor.Color,true); + if (!isselected) this.colorsFG.clearSelection(); + } else + this.colorsFG.select(this.FGColor.Color, true); - this._state.FGColor = this.FGColor.Color; - } + this._state.FGColor = this.FGColor.Color; + } - type1 = typeof(this.BGColor.Color); - type2 = typeof(this._state.BGColor); + type1 = typeof (this.BGColor.Color); + type2 = typeof (this._state.BGColor); - if ( (type1 !== type2) || (type1=='object' && - (this.BGColor.Color.effectValue!==this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color)<0)) || - (type1!='object' && this._state.BGColor.indexOf(this.BGColor.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (this.BGColor.Color.effectValue !== this._state.BGColor.effectValue || this._state.BGColor.color.indexOf(this.BGColor.Color.color) < 0)) || + (type1 != 'object' && this._state.BGColor.indexOf(this.BGColor.Color) < 0)) { - this.btnBGColor.setColor(this.BGColor.Color); - if ( typeof(this.BGColor.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue ) { - this.colorsBG.select(this.BGColor.Color,true); - isselected = true; - break; + this.btnBGColor.setColor(this.BGColor.Color); + if (typeof (this.BGColor.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == this.BGColor.Color.effectValue) { + this.colorsBG.select(this.BGColor.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsBG.clearSelection(); - } else - this.colorsBG.select(this.BGColor.Color,true); + if (!isselected) this.colorsBG.clearSelection(); + } else + this.colorsBG.select(this.BGColor.Color, true); - this._state.BGColor = this.BGColor.Color; - } + this._state.BGColor = this.BGColor.Color; + } - // Gradient colors - var gradColor1 = this.GradColors[0]; - if (!gradColor1) { - gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; - } - type1 = typeof(gradColor1.Color); - type2 = typeof(this._state.GradColor1); + // Gradient colors + var gradColor1 = this.GradColors[0]; + if (!gradColor1) { + gradColor1 = {Value: 1, Color: {color: '4f81bd', effectId: 24}}; + } + type1 = typeof (gradColor1.Color); + type2 = typeof (this._state.GradColor1); - if ( (type1 !== type2) || (type1=='object' && - (gradColor1.Color.effectValue!==this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color)<0)) || - (type1!='object' && this._state.GradColor1.indexOf(gradColor1.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (gradColor1.Color.effectValue !== this._state.GradColor1.effectValue || this._state.GradColor1.color.indexOf(gradColor1.Color.color) < 0)) || + (type1 != 'object' && this._state.GradColor1.indexOf(gradColor1.Color) < 0)) { - this.btnGradColor1.setColor(gradColor1.Color); - if ( typeof(gradColor1.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue ) { - this.colorsGrad1.select(gradColor1.Color,true); - isselected = true; - break; + this.btnGradColor1.setColor(gradColor1.Color); + if (typeof (gradColor1.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor1.Color.effectValue) { + this.colorsGrad1.select(gradColor1.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsGrad1.clearSelection(); - } else - this.colorsGrad1.select(gradColor1.Color,true); + if (!isselected) this.colorsGrad1.clearSelection(); + } else + this.colorsGrad1.select(gradColor1.Color, true); - this._state.GradColor1 = gradColor1.Color; - } + this._state.GradColor1 = gradColor1.Color; + } - var gradColor2 = this.GradColors[1]; - if (!gradColor2) { - gradColor2 = {Value: 1, Color: 'ffffff'}; - } - type1 = typeof(gradColor2.Color); - type2 = typeof(this._state.GradColor2); + var gradColor2 = this.GradColors[1]; + if (!gradColor2) { + gradColor2 = {Value: 1, Color: 'ffffff'}; + } + type1 = typeof (gradColor2.Color); + type2 = typeof (this._state.GradColor2); - if ( (type1 !== type2) || (type1=='object' && - (gradColor2.Color.effectValue!==this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color)<0)) || - (type1!='object' && this._state.GradColor2.indexOf(gradColor2.Color)<0 )) { + if ((type1 !== type2) || (type1 == 'object' && + (gradColor2.Color.effectValue !== this._state.GradColor2.effectValue || this._state.GradColor2.color.indexOf(gradColor2.Color.color) < 0)) || + (type1 != 'object' && this._state.GradColor2.indexOf(gradColor2.Color) < 0)) { - this.btnGradColor2.setColor(gradColor2.Color); - if ( typeof(gradColor2.Color) == 'object' ) { - var isselected = false; - for (var i=0; i<10; i++) { - if ( Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue ) { - this.colorsGrad2.select(gradColor2.Color,true); - isselected = true; - break; + this.btnGradColor2.setColor(gradColor2.Color); + if (typeof (gradColor2.Color) == 'object') { + var isselected = false; + for (var i = 0; i < 10; i++) { + if (Common.Utils.ThemeColor.ThemeValues[i] == gradColor2.Color.effectValue) { + this.colorsGrad2.select(gradColor2.Color, true); + isselected = true; + break; + } } - } - if (!isselected) this.colorsGrad2.clearSelection(); - } else - this.colorsGrad2.select(gradColor2.Color,true); + if (!isselected) this.colorsGrad2.clearSelection(); + } else + this.colorsGrad2.select(gradColor2.Color, true); - this._state.GradColor2 = gradColor2.Color; + this._state.GradColor2 = gradColor2.Color; + } + + this._noApply = false; } - - this._noApply = false; } }, From 0034a73687f0488d50debd9399db1503e90121b6 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Wed, 13 Nov 2019 13:24:42 +0300 Subject: [PATCH 11/14] Add script to developing version --- apps/documenteditor/sdk_dev_scripts.js | 1 + apps/presentationeditor/sdk_dev_scripts.js | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/documenteditor/sdk_dev_scripts.js b/apps/documenteditor/sdk_dev_scripts.js index f52c9e4fb..345333749 100644 --- a/apps/documenteditor/sdk_dev_scripts.js +++ b/apps/documenteditor/sdk_dev_scripts.js @@ -160,6 +160,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/Footnotes.js", "../../../../sdkjs/word/Editor/FootnotesChanges.js", "../../../../sdkjs/word/Editor/FootEndNote.js", + "../../../../sdkjs/word/Drawing/buttons.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", "../../../../sdkjs/word/Drawing/DrawingDocument.js", diff --git a/apps/presentationeditor/sdk_dev_scripts.js b/apps/presentationeditor/sdk_dev_scripts.js index 10b5ba925..fc7eccb9f 100644 --- a/apps/presentationeditor/sdk_dev_scripts.js +++ b/apps/presentationeditor/sdk_dev_scripts.js @@ -111,6 +111,7 @@ var sdk_dev_scrpipts = [ "../../../../sdkjs/word/Editor/StylesChanges.js", "../../../../sdkjs/word/Editor/RevisionsChange.js", "../../../../sdkjs/slide/Editor/Format/StylesPrototype.js", + "../../../../sdkjs/word/Drawing/buttons.js", "../../../../sdkjs/word/Drawing/Graphics.js", "../../../../sdkjs/word/Drawing/ShapeDrawer.js", "../../../../sdkjs/slide/Drawing/Transitions.js", From 1e89edb0364f2f03fe12b11cd5065b81e7bac2c4 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 13 Nov 2019 13:50:22 +0300 Subject: [PATCH 12/14] Update icons --- .../img/controls/common-controls@2x.png | Bin 18230 -> 9700 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index 86c6e0c1312d763960037c430d88899cef786f53..1c1de5bcb336627ae2d5143dbadd7c448c15a936 100755 GIT binary patch literal 9700 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 literal 18230 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 Date: Wed, 13 Nov 2019 13:51:32 +0300 Subject: [PATCH 13/14] [DE] Fix bug in version history (wrong history data parameters) --- apps/common/main/lib/controller/History.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/controller/History.js b/apps/common/main/lib/controller/History.js index 056183ee3..49bc3e55d 100644 --- a/apps/common/main/lib/controller/History.js +++ b/apps/common/main/lib/controller/History.js @@ -177,7 +177,7 @@ define([ if (historyStore && data!==null) { var rev, revisions = historyStore.findRevisions(data.version), urlGetTime = new Date(); - var diff = (this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes + var diff = (!opts.data.previous || this.currentChangeId===undefined) ? null : opts.data.changesUrl, // if revision has changes, but serverVersion !== app.buildVersion -> hide revision changes url = (!_.isEmpty(diff) && opts.data.previous) ? opts.data.previous.url : opts.data.url, docId = opts.data.key ? opts.data.key : this.currentDocId, docIdPrev = opts.data.previous && opts.data.previous.key ? opts.data.previous.key : this.currentDocIdPrev, From 637a129d63cc348c7e917c9cbb207a804466485b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 13 Nov 2019 14:14:41 +0300 Subject: [PATCH 14/14] Add Asc.c_oAscError.ID.UpdateVersion error --- apps/documenteditor/embed/js/ApplicationController.js | 7 ++++++- apps/documenteditor/embed/locale/en.json | 1 + apps/documenteditor/main/app/controller/Main.js | 7 ++++++- apps/documenteditor/main/locale/en.json | 1 + apps/documenteditor/mobile/app/controller/Main.js | 7 ++++++- apps/documenteditor/mobile/locale/en.json | 1 + apps/presentationeditor/embed/js/ApplicationController.js | 7 ++++++- apps/presentationeditor/embed/locale/en.json | 1 + apps/presentationeditor/main/app/controller/Main.js | 7 ++++++- apps/presentationeditor/main/locale/en.json | 1 + apps/presentationeditor/mobile/app/controller/Main.js | 7 ++++++- apps/presentationeditor/mobile/locale/en.json | 1 + apps/spreadsheeteditor/embed/js/ApplicationController.js | 7 ++++++- apps/spreadsheeteditor/embed/locale/en.json | 1 + apps/spreadsheeteditor/main/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/main/locale/en.json | 1 + apps/spreadsheeteditor/mobile/app/controller/Main.js | 7 ++++++- apps/spreadsheeteditor/mobile/locale/en.json | 1 + 18 files changed, 63 insertions(+), 9 deletions(-) diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index f8baf5891..7d8762564 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -402,6 +402,10 @@ DE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -558,6 +562,7 @@ DE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading document', txtClose: 'Close', - 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); \ No newline at end of file diff --git a/apps/documenteditor/embed/locale/en.json b/apps/documenteditor/embed/locale/en.json index 91cd7c4b4..b8debeec6 100644 --- a/apps/documenteditor/embed/locale/en.json +++ b/apps/documenteditor/embed/locale/en.json @@ -22,6 +22,7 @@ "DE.ApplicationController.unknownErrorText": "Unknown error.", "DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "DE.ApplicationController.waitText": "Please, wait...", + "DE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "DE.ApplicationView.txtDownload": "Download", "DE.ApplicationView.txtEmbed": "Embed", "DE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 2d83a458a..22beaaa0c 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1499,6 +1499,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2475,7 +2479,8 @@ define([ 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.' + txtNoText: 'Error! No text of specified style in document.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), 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 a488c637e..c752dd1d0 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -650,6 +650,7 @@ "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.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "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/mobile/app/controller/Main.js b/apps/documenteditor/mobile/app/controller/Main.js index 3044ec934..544a8e890 100644 --- a/apps/documenteditor/mobile/app/controller/Main.js +++ b/apps/documenteditor/mobile/app/controller/Main.js @@ -971,6 +971,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1456,7 +1460,8 @@ define([ textPaidFeature: 'Paid feature', 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.', 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index ce2b8b404..7f7d1f914 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -249,6 +249,7 @@ "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.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "DE.Controllers.Search.textNoTextFound": "Text not Found", "DE.Controllers.Search.textReplaceAll": "Replace All", "DE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index a140f01a6..f7e7c2deb 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -502,6 +502,10 @@ PE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -629,6 +633,7 @@ PE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading presentation', txtClose: 'Close', - 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); diff --git a/apps/presentationeditor/embed/locale/en.json b/apps/presentationeditor/embed/locale/en.json index a12071d1d..a6842c5f4 100644 --- a/apps/presentationeditor/embed/locale/en.json +++ b/apps/presentationeditor/embed/locale/en.json @@ -22,6 +22,7 @@ "PE.ApplicationController.unknownErrorText": "Unknown error.", "PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "PE.ApplicationController.waitText": "Please, wait...", + "PE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "PE.ApplicationView.txtDownload": "Download", "PE.ApplicationView.txtEmbed": "Embed", "PE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 29a8c48e3..f1629ec05 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1204,6 +1204,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2189,7 +2193,8 @@ define([ errorEmailClient: 'No email client could be found', 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.', 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), PE.Controllers.Main || {})) }); diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 4fdf6ab78..e1c99e63b 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -574,6 +574,7 @@ "PE.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.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "PE.Controllers.Statusbar.zoomText": "Zoom {0}%", "PE.Controllers.Toolbar.confirmAddFontName": "The font you are going to save is not available on the current device.
The text style will be displayed using one of the system fonts, the saved font will be used when it is available.
Do you want to continue?", "PE.Controllers.Toolbar.textAccent": "Accents", diff --git a/apps/presentationeditor/mobile/app/controller/Main.js b/apps/presentationeditor/mobile/app/controller/Main.js index 91013c9ff..e76ecd8a9 100644 --- a/apps/presentationeditor/mobile/app/controller/Main.js +++ b/apps/presentationeditor/mobile/app/controller/Main.js @@ -890,6 +890,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1397,7 +1401,8 @@ define([ textPaidFeature: 'Paid feature', 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.', 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), PE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index d3d620c77..0c5cee1df 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -225,6 +225,7 @@ "PE.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.", "PE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "PE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "PE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "PE.Controllers.Search.textNoTextFound": "Text not Found", "PE.Controllers.Search.textReplaceAll": "Replace All", "PE.Controllers.Settings.notcriticalErrorTitle": "Warning", diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 1c8078945..d9d561008 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -410,6 +410,10 @@ SSE.ApplicationController = new(function(){ message = me.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + message = me.errorUpdateVersionOnDisconnect; + break; + default: message = me.errorDefaultMessage.replace('%1', id); break; @@ -576,6 +580,7 @@ SSE.ApplicationController = new(function(){ waitText: 'Please, wait...', textLoadingDocument: 'Loading spreadsheet', txtClose: 'Close', - 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(); \ No newline at end of file diff --git a/apps/spreadsheeteditor/embed/locale/en.json b/apps/spreadsheeteditor/embed/locale/en.json index 11ac34dc1..448682490 100644 --- a/apps/spreadsheeteditor/embed/locale/en.json +++ b/apps/spreadsheeteditor/embed/locale/en.json @@ -22,6 +22,7 @@ "SSE.ApplicationController.unknownErrorText": "Unknown error.", "SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.", "SSE.ApplicationController.waitText": "Please, wait...", + "SSE.ApplicationController.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.ApplicationView.txtDownload": "Download", "SSE.ApplicationView.txtEmbed": "Embed", "SSE.ApplicationView.txtFullScreen": "Full Screen", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8239d6184..8a6694f98 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1406,6 +1406,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = (typeof id == 'string') ? id : this.errorDefaultMessage.replace('%1', id); break; @@ -2435,7 +2439,8 @@ define([ txtTime: 'Time', txtTab: 'Tab', txtFile: 'File', - 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download as...\' option to save the file backup copy to your computer hard drive.' } })(), SSE.Controllers.Main || {})) }); diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 32b86960b..6463233b9 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -743,6 +743,7 @@ "SSE.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.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download as...' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Print.strAllSheets": "All Sheets", "SSE.Controllers.Print.textWarning": "Warning", "SSE.Controllers.Print.txtCustom": "Custom", diff --git a/apps/spreadsheeteditor/mobile/app/controller/Main.js b/apps/spreadsheeteditor/mobile/app/controller/Main.js index b551e3551..4e3c9c118 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Main.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Main.js @@ -1044,6 +1044,10 @@ define([ config.msg = this.errorFileSizeExceed; break; + case Asc.c_oAscError.ID.UpdateVersion: + config.msg = this.errorUpdateVersionOnDisconnect; + break; + default: config.msg = this.errorDefaultMessage.replace('%1', id); break; @@ -1625,7 +1629,8 @@ 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.', errorFrmlMaxTextLength: 'Text values in formulas are limited to 255 characters.
Use the CONCATENATE function or concatenation operator (&)', 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.', + errorUpdateVersionOnDisconnect: 'The file version has been changed.
Use the \'Download\' option to save the file backup copy to your computer hard drive.' } })(), 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 bffbbb5e6..f18aac42b 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -286,6 +286,7 @@ "SSE.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.", "SSE.Controllers.Main.warnNoLicenseUsers": "This version of %1 editors has certain limitations for concurrent users.
If you need more please consider purchasing a commercial license.", "SSE.Controllers.Main.warnProcessRightsChange": "You have been denied the right to edit the file.", + "SSE.Controllers.Main.errorUpdateVersionOnDisconnect": "The file version has been changed.
Use the 'Download' option to save the file backup copy to your computer hard drive.", "SSE.Controllers.Search.textNoTextFound": "Text not found", "SSE.Controllers.Search.textReplaceAll": "Replace All", "SSE.Controllers.Settings.notcriticalErrorTitle": "Warning",