You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2018/12/21 06:26:54 UTC
[royale-asjs] 01/02: Merge branch 'develop' into
bugfix/issue_353_double_dispatch_of_change_event_in_Jewel_List
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch bugfix/issue_353_double_dispatch_of_change_event_in_Jewel_List
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit bbbd6eaee93ae81226a5d2e49e5537b84e1a1e28
Merge: 14f6354 1a1ccf9
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Dec 21 19:04:07 2018 +1300
Merge branch 'develop' into bugfix/issue_353_double_dispatch_of_change_event_in_Jewel_List
.../src/main/resources/jewel-example-styles.css | 5 +
.../TourDeJewel/src/main/royale/MainContent.mxml | 1 +
.../src/main/royale/PopUpViewPlayGround.mxml | 57 +++
.../main/royale/components/SomePopUpContent.mxml | 29 +-
.../src/main/royale/models/MainNavigationModel.as | 3 +-
frameworks/projects/Basic/.actionScriptProperties | 24 +-
frameworks/projects/Binding/.project | 6 +-
frameworks/projects/Charts/.project | 6 +-
frameworks/projects/Collections/.project | 6 +-
frameworks/projects/Core/.project | 6 +-
frameworks/projects/CreateJS/.project | 6 +-
frameworks/projects/DragDrop/.project | 6 +-
.../DragDrop/src/main/resources/basic-manifest.xml | 1 +
.../SensitiveSingleSelectionDropTargetBead.as | 411 +++++++++++++++++++++
frameworks/projects/Effects/.project | 6 +-
frameworks/projects/Flat/.project | 6 +-
frameworks/projects/Formatters/.project | 6 +-
frameworks/projects/GoogleMaps/.project | 6 +-
frameworks/projects/Graphics/.project | 6 +-
frameworks/projects/HTML/.project | 6 +-
frameworks/projects/HTML5/.project | 6 +-
frameworks/projects/JQuery/.project | 6 +-
.../projects/Jewel/src/main/resources/defaults.css | 87 +++++
.../Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 3 +
.../main/royale/org/apache/royale/jewel/PopUp.as | 109 ++++++
.../beads/controllers/PopUpMouseController.as | 184 +++++++++
.../apache/royale/jewel/beads/models/PopUpModel.as | 142 +++++++
.../apache/royale/jewel/beads/views/PopUpView.as | 237 ++++++++++++
.../Jewel/src/main/sass/components/_popup.sass | 126 +++++++
.../Jewel/src/main/sass/components/_textinput.sass | 15 +-
.../projects/Jewel/src/main/sass/defaults.sass | 1 +
frameworks/projects/Mobile/.project | 6 +-
frameworks/projects/Network/.project | 6 +-
frameworks/projects/Reflection/.project | 6 +-
.../src/main/sass/components-primary/_popup.sass | 27 ++
.../themes/JewelTheme/src/main/sass/defaults.sass | 1 +
manualtests/ResourceManagerTest/build.xml | 3 +
.../locale/en_US/messages.properties | 24 ++
.../locale/tr_TR/messages.properties | 24 ++
.../src/ResourceManagerTest.mxml | 18 +-
41 files changed, 1553 insertions(+), 82 deletions(-)