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 2018/08/31 09:38:09 UTC
[royale-asjs] branch develop updated: fix NPE in combobox
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 0df4a03 fix NPE in combobox
0df4a03 is described below
commit 0df4a031aeeb3f710a98880a1a27858c8bbbd4c0
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Aug 31 11:38:04 2018 +0200
fix NPE in combobox
---
.../royale/jewel/beads/controllers/ComboBoxController.as | 12 ++++++++++--
.../org/apache/royale/jewel/beads/views/ComboBoxView.as | 5 ++---
2 files changed, 12 insertions(+), 5 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 d96f60e..60a685c 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
@@ -86,9 +86,17 @@ package org.apache.royale.jewel.beads.controllers
}
protected function handleButtonClick(event:MouseEvent):void
- {
+ {
+ if(viewBead.popup != null)
+ {
+ IEventDispatcher(viewBead.popup).removeEventListener("change", handleListChange);
+ }
viewBead.popUpVisible = !viewBead.popUpVisible;
- IEventDispatcher(viewBead.popup).addEventListener("change", handleListChange);
+
+ if(viewBead.popup != null)
+ {
+ IEventDispatcher(viewBead.popup).addEventListener("change", handleListChange);
+ }
}
private function handleListChange(event:Event):void
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 4e3e85b..15c59a8 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
@@ -145,8 +145,7 @@ package org.apache.royale.jewel.beads.views
*/
public function get popUpVisible():Boolean
{
- if (_list) return _list.visible;
- else return false;
+ return _list == null ? false : true;
}
/**
* @royaleignorecoercion org.apache.royale.core.IComboBoxModel
@@ -169,7 +168,7 @@ package org.apache.royale.jewel.beads.views
var popupHost:IPopUpHost = UIUtils.findPopUpHost(_strand as IUIBase);
popupHost.popUpParent.addElement(_list);
}
- else {
+ else if(_list != null) {
UIUtils.removePopUp(_list);
_list = null;
}