You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/03 08:31:44 UTC

[royale-asjs] branch feature/new_merge updated (4af0b4f -> e6e171f)

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

harbs pushed a change to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from 4af0b4f  Jewel compiles
     add d8dcb41  ComboBox and DateField popups for Phone/Table (sliding up from bottom) and Desktop (classic fade out from control) responsive modes
     add 53606d6  update JewelExample
     add f816f90  separate combo & dropdown examples and refactor to Grid layout for better responsive layout
     new 1373c43  Merge branch 'develop' into feature/new_merge
     add 0147274  Update FileReference.as
     add c9055ae  Update UIComponent.as
     add dfb439a  Update Event.as
     add 6e7f698  Merge pull request #280 from pashminakazi/branch7
     new e6e171f  Merge branch 'feature/MXRoyale' into feature/new_merge

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/royale/ComboBoxPlayGround.mxml        | 114 ++++++++++++++++++++
 .../src/main/royale/DropDownListPlayGround.mxml    | 117 +++++++++------------
 .../JewelExample/src/main/royale/MainContent.mxml  |   3 +-
 .../src/main/royale/TablePlayGround.mxml           |   2 +-
 .../src/main/royale/models/MainNavigationModel.as  |   5 +-
 .../main/royale/org/apache/royale/events/Event.as  |   2 +
 .../projects/Jewel/src/main/resources/defaults.css |  50 +++++++--
 .../royale/jewel/beads/views/ComboBoxView.as       |  11 +-
 .../royale/jewel/beads/views/DateFieldView.as      |  68 ++++++++++--
 .../Jewel/src/main/sass/components/_combobox.sass  |  21 +++-
 .../Jewel/src/main/sass/components/_datefield.sass |  36 ++++++-
 .../src/main/royale/mx/core/UIComponent.as         |  12 +++
 .../src/main/royale/mx/net/FileReference.as        |   6 ++
 13 files changed, 347 insertions(+), 100 deletions(-)
 create mode 100644 examples/royale/JewelExample/src/main/royale/ComboBoxPlayGround.mxml


[royale-asjs] 01/02: Merge branch 'develop' into feature/new_merge

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1373c43cb59501ecc630922b94a3e1e21e1ce14d
Merge: 4af0b4f f816f90
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Sep 3 11:24:37 2018 +0300

    Merge branch 'develop' into feature/new_merge

 .../src/main/royale/ComboBoxPlayGround.mxml        | 114 ++++++++++++++++++++
 .../src/main/royale/DropDownListPlayGround.mxml    | 117 +++++++++------------
 .../JewelExample/src/main/royale/MainContent.mxml  |   3 +-
 .../src/main/royale/TablePlayGround.mxml           |   2 +-
 .../src/main/royale/models/MainNavigationModel.as  |   5 +-
 .../projects/Jewel/src/main/resources/defaults.css |  50 +++++++--
 .../royale/jewel/beads/views/ComboBoxView.as       |  11 +-
 .../royale/jewel/beads/views/DateFieldView.as      |  68 ++++++++++--
 .../Jewel/src/main/sass/components/_combobox.sass  |  21 +++-
 .../Jewel/src/main/sass/components/_datefield.sass |  36 ++++++-
 10 files changed, 327 insertions(+), 100 deletions(-)


[royale-asjs] 02/02: Merge branch 'feature/MXRoyale' into feature/new_merge

Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e6e171fd1f0a935ae55606efce7648985cb68772
Merge: 1373c43 6e7f698
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Sep 3 11:24:50 2018 +0300

    Merge branch 'feature/MXRoyale' into feature/new_merge

 .../Core/src/main/royale/org/apache/royale/events/Event.as   |  2 ++
 .../projects/MXRoyale/src/main/royale/mx/core/UIComponent.as | 12 ++++++++++++
 .../MXRoyale/src/main/royale/mx/net/FileReference.as         |  6 ++++++
 3 files changed, 20 insertions(+)