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

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

commit 8087f8d42c267b1b5acfaf966687d85a39f9a3d8
Merge: ade0559 aa4a0e3
Author: Alex Harui <[email protected]>
AuthorDate: Thu Apr 19 19:42:20 2018 -0700

    Merge branch 'feature/uibase-classname' into feature/MXRoyale

 .gitignore                                         |    7 +-
 .../main/royale/org/apache/royale/core/UIBase.as   |   35 +-
 .../projects/Core/src/main/royale/CoreClasses.as   |    1 +
 .../org/apache/royale/utils/ClassSelectorList.as   |  122 ++
 .../apache/royale/utils/cssclasslist/addStyles.as  |   40 +-
 .../royale/utils/cssclasslist/removeAllStyles.as   |    7 +-
 .../royale/utils/cssclasslist/removeStyles.as      |   37 +-
 .../royale/utils/cssclasslist/toggleStyle.as       |   30 +-
 .../main/royale/org/apache/royale/core/UIBase.as   | 1628 --------------------
 .../main/royale/org/apache/royale/jewel/Button.as  |   28 +-
 .../royale/org/apache/royale/jewel/CheckBox.as     |   24 +-
 .../royale/org/apache/royale/jewel/RadioButton.as  |   24 +-
 .../main/royale/org/apache/royale/jewel/Slider.as  |   10 +-
 .../royale/jewel/beads/layouts/HorizontalLayout.as |    2 +-
 .../beads/layouts/HorizontalLayoutSpaceBetween.as  |    2 +-
 .../layouts/HorizontalLayoutWithPaddingAndGap.as   |    2 +-
 .../royale/jewel/beads/layouts/VerticalLayout.as   |    2 +-
 .../layouts/VerticalLayoutWithPaddingAndGap.as     |    2 +-
 .../royale/jewel/supportClasses/TextFieldBase.as   |    4 +-
 19 files changed, 269 insertions(+), 1738 deletions(-)

diff --cc frameworks/projects/Core/src/main/royale/CoreClasses.as
index 72d0548,ae6fdca..a1061dd
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@@ -258,7 -258,7 +258,8 @@@ internal class CoreClasse
        import org.apache.royale.utils.date.addSeconds; addSeconds;
        import org.apache.royale.utils.date.addYears; addYears;
  
 +    import org.apache.royale.core.TextLineMetrics; TextLineMetrics;
+     import org.apache.royale.utils.ClassSelectorList; ClassSelectorList;
  }
  
  }

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to