From b96f4fd72ee83c5e41a84c33c2f42f0f271eaeaa Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 24 May 2017 15:04:06 +0300 Subject: [PATCH] [DE] Bug in ComboBoxFonts when recent: 0 (in the DropCapSettings dialog). --- apps/common/main/lib/component/ComboBoxFonts.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index cad09b845..c1bf141bd 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -383,12 +383,11 @@ define([ } $(this.el).find('ul').scrollTop(0); this.trigger('show:after', this, e); + this.flushVisibleFontsTiles(); + this.updateVisibleFontsTiles(null, 0); } else { Common.UI.ComboBox.prototype.onAfterShowMenu.apply(this, arguments); } - - this.flushVisibleFontsTiles(); - this.updateVisibleFontsTiles(null, 0); }, onAfterHideMenu: function(e) { @@ -399,6 +398,8 @@ define([ }, addItemToRecent: function(record) { + if (this.recent<1) return; + if (record.get('type') != FONT_TYPE_RECENT && !this.store.findWhere({name: record.get('name'),type:FONT_TYPE_RECENT})) { var fonts = this.store.where({type:FONT_TYPE_RECENT});