You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/06/14 11:54:09 UTC
[royale-asjs] branch develop updated: jewel-comboboxcontroller: add
isFocused
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 253bfb0 jewel-comboboxcontroller: add isFocused
253bfb0 is described below
commit 253bfb0375fda82c691ff4f9de11fb494407d7f9
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Jun 14 13:53:59 2020 +0200
jewel-comboboxcontroller: add isFocused
---
.../royale/jewel/beads/controllers/ComboBoxController.as | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
index b637f3c..f77356f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ComboBoxController.as
@@ -22,15 +22,22 @@ package org.apache.royale.jewel.beads.controllers
{
import flash.utils.setTimeout;
}
+ COMPILE::JS
+ {
+ import org.apache.royale.utils.html.isFocused;
+ }
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.IComboBoxModel;
import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.IItemRendererOwnerView;
import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.UIBase;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.KeyboardEvent;
import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.events.utils.NavigationKeys;
+ import org.apache.royale.events.utils.WhitespaceKeys;
import org.apache.royale.html.beads.IListView;
import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.List;
@@ -38,8 +45,6 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.jewel.beads.models.IJewelSelectionModel;
import org.apache.royale.jewel.beads.views.ComboBoxPopUpView;
import org.apache.royale.jewel.supportClasses.combobox.ComboBoxPopUp;
- import org.apache.royale.events.utils.NavigationKeys;
- import org.apache.royale.events.utils.WhitespaceKeys;
/**
* The ComboBoxController class is responsible for listening to
@@ -153,7 +158,7 @@ package org.apache.royale.jewel.beads.controllers
{
COMPILE::JS
{
- if (document.activeElement !== viewBead.textinput.element)
+ if (isFocused(viewBead.textinput as UIBase))
return;
}