[royale-asjs] branch develop updated: jewel-prompt-beads: some improvements over last commit

[carlosrovira]

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 a9a95e5  jewel-prompt-beads: some improvements over last commit
a9a95e5 is described below

commit a9a95e5804fba96431ed0ab7f57dae5e65cfe004
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Wed Mar 4 18:22:54 2020 +0100

    jewel-prompt-beads: some improvements over last commit
---
 .../beads/controls/combobox/ComboBoxTextPrompt.as     |  3 +--
 .../beads/controls/datefield/DateFieldTextPrompt.as   |  3 +--
 .../apache/royale/jewel/beads/views/ComboBoxView.as   | 19 +++++++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
index bb6cb94..c6099a1 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxTextPrompt.as
@@ -60,8 +60,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                COMPILE::JS
                override protected function updatePromptText():void
                {
-                       var e:HTMLInputElement = (host.view as 
IComboBoxView).textinput.element as HTMLInputElement;
-                       e.placeholder = prompt;
+                       (host.view as 
IComboBoxView).textinput.input.placeholder = prompt;
                }
        }
 }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
index d2c4212..476d512 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldTextPrompt.as
@@ -60,8 +60,7 @@ package org.apache.royale.jewel.beads.controls.datefield
                COMPILE::JS
                override protected function updatePromptText():void
                {
-                       var e:HTMLInputElement = (host.view as 
DateFieldView).textInput.element as HTMLInputElement;
-                       e.placeholder = prompt;
+                       (host.view as 
DateFieldView).textInput.input.placeholder = prompt;
                }
        }
 }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
index 7881abc..f3e3cdc 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ComboBoxView.as
@@ -143,6 +143,14 @@ package org.apache.royale.jewel.beads.views
                        parent.addElement(_textinput);
                        parent.addElement(_button);
 
+
+                       listenOnStrand("sizeChanged", handleSizeChange);
+                       listenOnStrand("initComplete", initCompleteHandler);
+               }
+
+               protected function initCompleteHandler(event:Event):void
+               {
+                       
IEventDispatcher(_strand).removeEventListener("initComplete",initCompleteHandler);
                        model = _strand.getBeadByType(IComboBoxModel) as 
IComboBoxModel;
                        _presentationModel = (_strand as 
ComboBox).presentationModel;
 
@@ -150,15 +158,10 @@ package org.apache.royale.jewel.beads.views
                                //do this here as well as in the controller,
                                //to cover possible variation in the order of 
bead instantiation
                                //this avoids the need to redispatch new event 
clones at the component level in the controller
-                IJewelSelectionModel(model).dispatcher = 
IEventDispatcher(value);
+                IJewelSelectionModel(model).dispatcher = 
IEventDispatcher(_strand);
                        }
-                       if(model)
-                       {
-                               model.addEventListener("selectionChanged", 
handleItemChange);
-                               model.addEventListener("dataProviderChanged", 
itemChangeAction);
-                       }
-
-                       listenOnStrand("sizeChanged", handleSizeChange);
+                       model.addEventListener("selectionChanged", 
handleItemChange);
+                       model.addEventListener("dataProviderChanged", 
itemChangeAction);
                }
 
                private var model:IComboBoxModel;