From 5434d86eaa085100f0cbd30241734065db3b03c0 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 5 May 2021 19:03:08 +0300 Subject: [PATCH 1/2] [DE] Fix list preview --- .../main/app/view/ListSettingsDialog.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/view/ListSettingsDialog.js b/apps/documenteditor/main/app/view/ListSettingsDialog.js index 310ecda94c..b9c4486bc5 100644 --- a/apps/documenteditor/main/app/view/ListSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ListSettingsDialog.js @@ -336,6 +336,8 @@ define([ }); this.levelsList.on('item:select', _.bind(this.onSelectLevel, this)); + this.on('animate:after', _.bind(this.onAnimateAfter, this)); + this.afterRender(); }, @@ -347,6 +349,12 @@ define([ return this.type > 0 ? this.cmbFormat : this.cmbAlign; }, + onAnimateAfter: function() { + if (this.api) { + this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2); + } + }, + afterRender: function() { this.updateThemeColors(); this._setDefaults(this.props); @@ -552,9 +560,6 @@ define([ } else this.cmbFormat.setValue((format!==undefined) ? format : ''); } - if (this.api) { - this.api.SetDrawImagePreviewBullet('bulleted-list-preview', this.props, this.level, this.type==2); - } }, txtTitle: 'List Settings', From 766d47e7af1b1070c23f90b654abb773541fd9f5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 5 May 2021 19:13:21 +0300 Subject: [PATCH 2/2] [SSE] Fix Bug 49257 --- apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js index 564b0f96a0..f2c66a338e 100644 --- a/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/HyperlinkSettingsDialog.js @@ -142,7 +142,7 @@ define([ style : 'width: 100%;', validation : function(value) { var trimmed = $.trim(value); - if (trimmed.length>2083) return me.txtSizeLimit; + if (me.api.asc_getFullHyperlinkLength(trimmed)>2083) return me.txtSizeLimit; var urltype = me.api.asc_getUrlType(trimmed); me.isEmail = (urltype==2);