Merge branch 'develop' into tlf
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b1d89fad Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b1d89fad Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b1d89fad Branch: refs/heads/tlf Commit: b1d89fadaa5a7c96bf5fcdee64b7f1c09c673eec Parents: b32119f 262bca1 Author: Harbs <[email protected]> Authored: Mon Jul 3 16:32:29 2017 +0300 Committer: Harbs <[email protected]> Committed: Mon Jul 3 16:32:29 2017 +0300 ---------------------------------------------------------------------- build.xml | 10 + distribution/pom.xml | 13 +- distribution/src/main/assembly/component.xml | 4 +- .../ASDoc/src/main/config/asdoc-config.xml | 9 + examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +- .../main/resources/mdl-js-index-template.html | 4 +- .../main/resources/mdl-js-index-template.html | 2 +- .../MDLExample/src/main/flex/DropDownList.mxml | 42 +-- .../src/main/flex/models/MenuModel.as | 8 +- .../MDLExample/src/main/flex/vos/MenuItemVO.as | 4 +- .../main/resources/mdl-js-index-template.html | 2 +- .../Basic/src/main/flex/BasicClasses.as | 2 +- .../flex/html/beads/DataFieldProviderBead.as | 89 +++++++ .../DataItemRendererFactoryForArrayData.as | 24 +- .../DataItemRendererFactoryForArrayList.as | 37 ++- .../Basic/src/main/resources/basic-manifest.xml | 1 + .../org/apache/flex/core/IDataProviderModel.as | 9 +- .../org/apache/flex/core/SimpleCSSValuesImpl.as | 11 +- .../main/flex/org/apache/flex/html/Option.as | 110 ++++++++ .../main/flex/org/apache/flex/html/Select.as | 69 +++++ .../HTML/src/main/resources/basic-manifest.xml | 4 +- .../src/main/flex/MDLClasses.as | 1 + .../flex/org/apache/flex/mdl/DropDownList.as | 153 ++++++++--- .../src/main/flex/org/apache/flex/mdl/List.as | 258 ------------------- .../beads/controllers/DropDownListController.as | 55 ++-- .../flex/mdl/beads/models/DropDownListModel.as | 64 +++++ .../flex/mdl/beads/models/IDropDownListModel.as | 43 ++++ .../flex/mdl/beads/views/DropDownListView.as | 121 +++++---- .../itemRenderers/DropDownListItemRenderer.as | 108 ++++++++ .../src/main/resources/defaults.css | 10 +- .../src/main/resources/mdl-manifest.xml | 2 + nightly.properties | 2 +- 32 files changed, 818 insertions(+), 455 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Basic/src/main/flex/BasicClasses.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Basic/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b1d89fad/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as ---------------------------------------------------------------------- diff --cc frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as index 36198f6,16b42c6..740e6ab --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as @@@ -788,9 -795,11 +795,11 @@@ package org.apache.flex.cor var value:* = styles[p]; if (value === undefined) continue; - if (typeof(value) === 'number') { + if (typeof(value) == 'number') { if (colorStyles[p]) value = CSSUtils.attributeFromColor(value); + else if (numericStyles[p]) + value = value.toString(); else value = value.toString() + 'px'; }
