This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 80f932e87d1a3d246389bc73572d8299e6064972
Merge: 74f3d81 4a36cf3
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Nov 14 09:58:57 2018 +0200
Merge branch 'feature/modal' into develop
# Conflicts:
#
frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
examples/royale/AlertExample/asconfig.json | 14 ++
.../royale/AlertExample/src/main/royale/ASModal.as | 56 ++++++
.../AlertExample/src/main/royale/AlertExample.mxml | 29 ++-
.../AlertExample/src/main/royale/MXMLModal.mxml | 29 +++
.../Basic/src/main/resources/basic-manifest.xml | 3 +
.../main/royale/org/apache/royale/core/UIBase.as | 8 +-
.../royale/html/beads/plugin/IModalDisplay.as | 35 ++++
.../royale/html/beads/plugin/ModalDisplay.as | 196 +++++++++++++++++++
.../royale/html/beads/plugin/ModalOverlay.as | 215 +++++++++++++++++++++
9 files changed, 580 insertions(+), 5 deletions(-)
diff --cc
frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index fe894e3,ba2488d..457173f
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@@ -27,20 -27,20 +27,20 @@@ package org.apache.royale.cor
import org.apache.royale.events.utils.MouseEventConverter;
}
+ import org.apache.royale.core.IId;
++ import org.apache.royale.core.IStyleObject;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.MouseEvent;
+ import org.apache.royale.events.ValueChangeEvent;
- import org.apache.royale.utils.StringUtil;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
+
COMPILE::JS
{
import org.apache.royale.html.util.addElementToWrapper;
import org.apache.royale.utils.CSSUtils;
}
-
+
- import org.apache.royale.core.IId;
- import org.apache.royale.core.IStyleObject;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.events.ValueChangeEvent;
- import org.apache.royale.utils.loadBeadFromValuesManager;
-
-
/**
* Set a different class for click events so that
* there aren't dependencies on the flash classes
