From 3e6bbee3e3b6d50922573a69f04853697c3c421d Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 11 Apr 2017 16:47:14 +0300 Subject: [PATCH] Fixed Bug 34263, 25318. --- apps/common/main/lib/component/ComboBoxFonts.js | 2 +- apps/common/main/lib/component/MetricSpinner.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/common/main/lib/component/ComboBoxFonts.js b/apps/common/main/lib/component/ComboBoxFonts.js index 54911b4fb..af7cd2351 100644 --- a/apps/common/main/lib/component/ComboBoxFonts.js +++ b/apps/common/main/lib/component/ComboBoxFonts.js @@ -193,7 +193,7 @@ define([ me.onAfterHideMenu(e); }, 10); } else if (e.keyCode != Common.UI.Keys.RETURN && e.keyCode != Common.UI.Keys.CTRL && e.keyCode != Common.UI.Keys.SHIFT && e.keyCode != Common.UI.Keys.ALT){ - if (!this.isMenuOpen()) + if (!this.isMenuOpen() && !e.ctrlKey) this.openMenu(); if (e.keyCode == Common.UI.Keys.UP || e.keyCode == Common.UI.Keys.DOWN) { diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js index f970dfe95..787221813 100644 --- a/apps/common/main/lib/component/MetricSpinner.js +++ b/apps/common/main/lib/component/MetricSpinner.js @@ -347,7 +347,7 @@ define([ var value = this.getRawValue(); if (this.value != value) { this.onEnterValue(); - return false; + return (this.value == value); } } else { this.onEnterValue();