This is an automated email from the ASF dual-hosted git repository.

raudjcholo pushed a commit to branch ComboBoxListCloseOnClick
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/ComboBoxListCloseOnClick by 
this push:
     new 279939e  Remove new functionality from SearchfFilter bead
279939e is described below

commit 279939e5f5740a8f708c76d757b5f1013e6d3827
Author: Raul Nuñez <[email protected]>
AuthorDate: Thu Dec 10 17:33:22 2020 +0100

    Remove new functionality from SearchfFilter bead
---
 .../jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as  | 10 +---------
 .../royale/jewel/beads/controls/combobox/SearchFilter.as       | 10 ----------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
index b3af3d6..374b0f1 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxListCloseOnClick.as
@@ -61,20 +61,12 @@ package org.apache.royale.jewel.beads.controls.combobox
             var itemRendererClass:Class = 
ValuesManager.valuesImpl.getValue(comboView.host, "iItemRenderer") as Class;
             // Apart from checking that the bead is applied to a Jewel 
ComboBox,
             // it is checked that the combobox has a custom item renderer 
assigned and that it does not have the SearchFilter bead
-             if (comboView && (comboBox.itemRenderer || itemRendererClass != 
null) && beadsIsNotIncludedSearchFilter(comboBox.beads)){
+             if (comboView && (comboBox.itemRenderer || itemRendererClass != 
null)){
                 (value as IEventDispatcher).addEventListener('popUpOpened', 
popUpOpenedHandler, false);
                 (value as IEventDispatcher).addEventListener('popUpClosed', 
popUpClosedHandler, false);
              }
                }
 
-        private function beadsIsNotIncludedSearchFilter(beads:Array):Boolean{
-            for(var i:int = 0; i<beads.length; i++){
-                if(beads[i] is SearchFilter)
-                    return false;
-            }
-            return true;
-        }
-
         protected function popUpOpenedHandler():void {
                        list = comboView.popup.view.list;
                }
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 59d01d0..89322d5 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
@@ -118,17 +118,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                public override function set list(value:List):void
         {
             super.list = value;
-            COMPILE::JS
-                       {
-                       if (list != null)
-                   list.addEventListener(MouseEvent.CLICK, onListClick);
-            }
         }
 
-        private function onListClick(event:MouseEvent):void
-        {
-                       list.removeEventListener(MouseEvent.CLICK, onListClick);
-            comboView.popUpVisible = false;
-        }
        }
 }

Reply via email to