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/10/05 12:07:24 UTC

[royale-asjs] branch develop updated: jewel-combobox: solve some issues with RTEs

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 76bc6a8  jewel-combobox: solve some issues with RTEs
76bc6a8 is described below

commit 76bc6a8a63bfc8134355f84689ecc5f9e0dbf92b
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Oct 5 14:07:14 2020 +0200

    jewel-combobox: solve some issues with RTEs
---
 .../royale/jewel/beads/controls/combobox/SearchFilter.as  |  2 ++
 .../jewel/beads/controls/textinput/SearchFilterForList.as | 15 ++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as
index 5049a9b..a71db61 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/SearchFilter.as
@@ -52,6 +52,8 @@ package org.apache.royale.jewel.beads.controls.combobox
 
 		override protected function textInputKeyUpLogic(input:Object):void
 		{
+			if(!list) return;
+			
 			// first remove a previous selection
 			if(list.selectedIndex != -1)
 			{
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
index dee4770..9b5a2d6 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/textinput/SearchFilterForList.as
@@ -75,11 +75,8 @@ package org.apache.royale.jewel.beads.controls.textinput
 		}
 		public function set list(value:List):void
 		{
-			if(_list)
-			{
-				removeListListeners();
-			}
-
+			removeListListeners();
+			
 			_list = value;
 
 			if(_list)
@@ -97,11 +94,13 @@ package org.apache.royale.jewel.beads.controls.textinput
 		}
 
 		protected function addListListeners():void {
-			list.addEventListener(KeyboardEvent.KEY_DOWN, keyDownEventHandler, true);
+			if(_list)
+				_list.addEventListener(KeyboardEvent.KEY_DOWN, keyDownEventHandler, true);
 		}
 
 		protected function removeListListeners():void {
-			list.removeEventListener(KeyboardEvent.KEY_DOWN, keyDownEventHandler, true);
+			if(_list)
+				_list.removeEventListener(KeyboardEvent.KEY_DOWN, keyDownEventHandler, true);
 		}
 
 		/**
@@ -263,6 +262,8 @@ package org.apache.royale.jewel.beads.controls.textinput
 
 		protected function textInputKeyUpLogic(input:Object):void
 		{
+			if(!list) return;
+			
 			// first remove a previous selection
 			if(list.selectedIndex != -1)
 				list.selectedItem = null;