From 056d49097a355fcc817a7ba6ceb76148334d4eb1 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 20 Oct 2020 21:29:13 +0300 Subject: [PATCH 1/6] [SSE] Fix translation --- apps/spreadsheeteditor/main/locale/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/locale/ru.json b/apps/spreadsheeteditor/main/locale/ru.json index 94dcbe259..f973540c3 100644 --- a/apps/spreadsheeteditor/main/locale/ru.json +++ b/apps/spreadsheeteditor/main/locale/ru.json @@ -1230,7 +1230,7 @@ "SSE.Views.AutoFilterDialog.txtLess": "Меньше...", "SSE.Views.AutoFilterDialog.txtLessEquals": "Меньше или равно...", "SSE.Views.AutoFilterDialog.txtNotBegins": "Не начинается с...", - "SSE.Views.AutoFilterDialog.txtNotBetween": "не между...", + "SSE.Views.AutoFilterDialog.txtNotBetween": "Не между...", "SSE.Views.AutoFilterDialog.txtNotContains": "Не содержит...", "SSE.Views.AutoFilterDialog.txtNotEnds": "Не оканчивается на...", "SSE.Views.AutoFilterDialog.txtNotEquals": "Не равно...", From e87bac346de4ef05393474513b2e4c4ca4fb671a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 12:47:11 +0300 Subject: [PATCH 2/6] Fix Bug 46996 --- apps/common/mobile/lib/component/ThemeColorPalette.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/mobile/lib/component/ThemeColorPalette.js b/apps/common/mobile/lib/component/ThemeColorPalette.js index 81476d4f6..6904ff935 100644 --- a/apps/common/mobile/lib/component/ThemeColorPalette.js +++ b/apps/common/mobile/lib/component/ThemeColorPalette.js @@ -214,7 +214,7 @@ define([ } if (/^[a-fA-F0-9]{6}|transparent$/.test(color) || _.indexOf(Common.Utils.ThemeColor.getStandartColors(), color) > -1 || _.indexOf(this.dynamicColors, color) > -1) { - el.find('.color-palette a[data-color=' + color + ']').first().addClass('active'); + el.find('.standart-colors a[data-color=' + color + '], .dynamic-colors a[data-color=' + color + ']').first().addClass('active'); } } From af7218d1b5f7d08c8d290fc66746bba217c95856 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 14:25:02 +0300 Subject: [PATCH 3/6] [PE mobile] Fix Bug 46990 --- apps/presentationeditor/mobile/resources/css/app-ios.css | 1 - apps/presentationeditor/mobile/resources/css/app-material.css | 1 - apps/presentationeditor/mobile/resources/less/app-ios.less | 1 - apps/presentationeditor/mobile/resources/less/app-material.less | 1 - 4 files changed, 4 deletions(-) diff --git a/apps/presentationeditor/mobile/resources/css/app-ios.css b/apps/presentationeditor/mobile/resources/css/app-ios.css index 15b182f75..f3a167687 100644 --- a/apps/presentationeditor/mobile/resources/css/app-ios.css +++ b/apps/presentationeditor/mobile/resources/css/app-ios.css @@ -7670,7 +7670,6 @@ html.pixel-ratio-3 .numbers li { } .slide-theme .row div { margin: 0; - padding: 3px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15); width: 85px; height: 38px; diff --git a/apps/presentationeditor/mobile/resources/css/app-material.css b/apps/presentationeditor/mobile/resources/css/app-material.css index 3da0b2316..cbc39d22a 100644 --- a/apps/presentationeditor/mobile/resources/css/app-material.css +++ b/apps/presentationeditor/mobile/resources/css/app-material.css @@ -7589,7 +7589,6 @@ html.pixel-ratio-3 .numbers li { } .slide-theme .row div { margin: 0; - padding: 3px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15); width: 85px; height: 38px; diff --git a/apps/presentationeditor/mobile/resources/less/app-ios.less b/apps/presentationeditor/mobile/resources/less/app-ios.less index a2ce76091..26369273e 100644 --- a/apps/presentationeditor/mobile/resources/less/app-ios.less +++ b/apps/presentationeditor/mobile/resources/less/app-ios.less @@ -217,7 +217,6 @@ input, textarea { div { margin: 0; - padding: 3px; box-shadow: 0 0 0 1px rgba(0,0,0,0.15); width: 85px; height: 38px; diff --git a/apps/presentationeditor/mobile/resources/less/app-material.less b/apps/presentationeditor/mobile/resources/less/app-material.less index 71d2221e3..b3418e3de 100644 --- a/apps/presentationeditor/mobile/resources/less/app-material.less +++ b/apps/presentationeditor/mobile/resources/less/app-material.less @@ -229,7 +229,6 @@ input, textarea { div { margin: 0; - padding: 3px; box-shadow: 0 0 0 1px rgba(0,0,0,0.15); width: 85px; height: 38px; From 5a18c00f2071142de57341556f9e13e4a4d58fb3 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 16:28:47 +0300 Subject: [PATCH 4/6] Fix Bug 47021 --- apps/documenteditor/main/app/view/DocumentHolder.js | 4 ++-- apps/presentationeditor/main/app/view/DocumentHolder.js | 2 +- apps/spreadsheeteditor/main/app/controller/DocumentHolder.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index c986e8257..264692944 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -3103,7 +3103,7 @@ define([ cls = 'menu__icon text-orient-rdown'; break; case Asc.c_oAscCellTextDirection.BTLR: - cls = 'menu__icon btn-align-rup'; + cls = 'menu__icon text-orient-rup'; break; } menuTableDirection.setIconCls(cls); @@ -3788,7 +3788,7 @@ define([ cls = 'menu__icon text-orient-rdown'; break; case Asc.c_oAscVertDrawingText.vert270: - cls = 'menu__icon btn-align-rup'; + cls = 'menu__icon text-orient-rup'; break; } menuParagraphDirection.setIconCls(cls); diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 3e24b8da3..2dcd960cb 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -3137,7 +3137,7 @@ define([ cls = 'menu__icon text-orient-rdown'; break; case Asc.c_oAscVertDrawingText.vert270: - cls = 'menu__icon btn-align-rup'; + cls = 'menu__icon text-orient-rup'; break; } menuParagraphDirection.setIconCls(cls); diff --git a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js index a85e080f1..f2d676dd1 100644 --- a/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js +++ b/apps/spreadsheeteditor/main/app/controller/DocumentHolder.js @@ -1804,7 +1804,7 @@ define([ cls = 'menu__icon text-orient-rdown'; break; case Asc.c_oAscVertDrawingText.vert270: - cls = 'menu__icon btn-align-rup'; + cls = 'menu__icon text-orient-rup'; break; } documentHolder.menuParagraphDirection.setIconCls(cls); From 749feeab838b1a84f54103f3674ecc7d2bff783b Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 16:51:44 +0300 Subject: [PATCH 5/6] [DE][SSE] Fix autocorrect dialog (use close button for all tabs) --- .../common/main/lib/view/AutoCorrectDialog.js | 79 ++++++------------- 1 file changed, 25 insertions(+), 54 deletions(-) diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 9651fa4fa..48a9ca33a 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -84,8 +84,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', '
', '
', '', - '', - '', '
' ].join('') }, options || {}); @@ -106,43 +104,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', value = Common.Utils.InternalSettings.get(path + "-rem"); this.arrRemRec = value ? JSON.parse(value) : []; - if (this.appPrefix=='de-') { - var me = this; - this.options.handler = function(result, value) { - if ( result == 'ok' ) { - var value = me.chBulleted.getValue()==='checked'; - Common.localStorage.setBool("de-settings-autoformat-bulleted", value); - Common.Utils.InternalSettings.set("de-settings-autoformat-bulleted", value); - me.api.asc_SetAutomaticBulletedLists(value); - - value = me.chNumbered.getValue()==='checked'; - Common.localStorage.setBool("de-settings-autoformat-numbered", value); - Common.Utils.InternalSettings.set("de-settings-autoformat-numbered", value); - me.api.asc_SetAutomaticNumberedLists(value); - - value = me.chQuotes.getValue()==='checked'; - Common.localStorage.setBool("de-settings-autoformat-smart-quotes", value); - Common.Utils.InternalSettings.set("de-settings-autoformat-smart-quotes", value); - me.api.asc_SetAutoCorrectSmartQuotes(value); - - value = me.chHyphens.getValue()==='checked'; - Common.localStorage.setBool("de-settings-autoformat-hyphens", value); - Common.Utils.InternalSettings.set("de-settings-autoformat-hyphens", value); - me.api.asc_SetAutoCorrectHyphensWithDash(value); - } - }; - } else if (this.appPrefix=='sse-') { - var me = this; - this.options.handler = function(result, value) { - if ( result == 'ok' ) { - var value = me.chNewRows.getValue()==='checked'; - Common.localStorage.setBool("sse-settings-autoformat-new-rows", value); - Common.Utils.InternalSettings.set("sse-settings-autoformat-new-rows", value); - me.api.asc_setIncludeNewRowColTable(value); - } - }; - } - Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); }, @@ -321,36 +282,57 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', el: $('#id-autocorrect-dialog-chk-quotes'), labelText: this.textQuotes, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-smart-quotes") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-smart-quotes", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-smart-quotes", checked); + me.api.asc_SetAutoCorrectSmartQuotes(checked); }); this.chHyphens = new Common.UI.CheckBox({ el: $('#id-autocorrect-dialog-chk-hyphens'), labelText: this.textHyphens, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyphens") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-hyphens", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-hyphens", checked); + me.api.asc_SetAutoCorrectHyphensWithDash(checked); }); this.chBulleted = new Common.UI.CheckBox({ el: $('#id-autocorrect-dialog-chk-bulleted'), labelText: this.textBulleted, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-bulleted") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-bulleted", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-bulleted", checked); + me.api.asc_SetAutomaticBulletedLists(checked); }); this.chNumbered = new Common.UI.CheckBox({ el: $('#id-autocorrect-dialog-chk-numbered'), labelText: this.textNumbered, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-numbered") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-numbered", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-numbered", checked); + me.api.asc_SetAutomaticNumberedLists(checked); }); } else if (this.appPrefix=='sse-') { this.chNewRows = new Common.UI.CheckBox({ el: $('#id-autocorrect-dialog-chk-new-rows'), labelText: this.textNewRowCol, value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-new-rows") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-new-rows", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-new-rows", checked); + me.api.asc_setIncludeNewRowColTable(checked); }); } - this.applyButtons = $window.find('.dlg-btn.can-apply'); - this.closeButtons = $window.find('.dlg-btn:not(.can-apply)'); - this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false)); this.btnsCategory[1].on('click', _.bind(this.onRecCategoryClick, this, false)); - this.btnsCategory[2] && this.btnsCategory[2].on('click', _.bind(this.updateFooterButtons, this, true)); this.afterRender(); }, @@ -402,7 +384,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var value = this.getActiveCategory(); if (value==0) this.onMathCategoryClick(true); else if (value==1) this.onRecCategoryClick(true); - this.updateFooterButtons(value>1); }, close: function() { @@ -412,8 +393,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }, onMathCategoryClick: function(delay) { - this.updateFooterButtons(false); - var me = this; _.delay(function(){ $('input', me.inputReplace.cmpEl).select().focus(); @@ -673,8 +652,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }, onRecCategoryClick: function(delay) { - this.updateFooterButtons(false); - var me = this; _.delay(function(){ $('input', me.inputRecFind.cmpEl).select().focus(); @@ -766,12 +743,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.btnAddRec.setDisabled(!!rec || !value); }, - updateFooterButtons: function(apply) { - this.applyButtons.toggleClass('hidden', !apply); - this.closeButtons.toggleClass('hidden', apply); - }, - - textTitle: 'AutoCorrect', textMathCorrect: 'Math AutoCorrect', textReplace: 'Replace', From f4dd30f6f5d823f5c1e1db7d21a8deaed857f9a8 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 21 Oct 2020 18:55:04 +0300 Subject: [PATCH 6/6] Fix Bug 47026 --- apps/documenteditor/mobile/app/view/edit/EditTable.js | 2 +- apps/presentationeditor/mobile/app/view/edit/EditTable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/app/view/edit/EditTable.js b/apps/documenteditor/mobile/app/view/edit/EditTable.js index 30b7e7976..50b6a1b00 100644 --- a/apps/documenteditor/mobile/app/view/edit/EditTable.js +++ b/apps/documenteditor/mobile/app/view/edit/EditTable.js @@ -114,7 +114,7 @@ define([ renderStyles: function() { var $styleContainer = $('#edit-table-styles .item-inner'); - if ($styleContainer.length > 0) { + if ($styleContainer.length > 0 && $styleContainer.is(':visible')) { var columns = parseInt(($styleContainer.width() - 15) / 70), // magic row = -1, styles = []; diff --git a/apps/presentationeditor/mobile/app/view/edit/EditTable.js b/apps/presentationeditor/mobile/app/view/edit/EditTable.js index 98c3345f7..b1f5cc50c 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditTable.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditTable.js @@ -115,7 +115,7 @@ define([ renderStyles: function() { var $styleContainer = $('#edit-table-styles .item-inner'); - if ($styleContainer.length > 0) { + if ($styleContainer.length > 0 && $styleContainer.is(':visible')) { var columns = parseInt($styleContainer.width() / 70), // magic row = -1, styles = [];