flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [01/50] git commit: [flex-asjs] [refs/heads/develop] - Merge branch 'release0.8.0' into tlf
Date Mon, 03 Jul 2017 13:34:55 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 262bca151 -> b1d89fada


Merge branch 'release0.8.0' 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/22a1145a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/22a1145a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/22a1145a

Branch: refs/heads/develop
Commit: 22a1145a53c4045cc06d7c20472027c3948a85b8
Parents: 43a696c 1656e37
Author: piotrz <piotrz@apache.org>
Authored: Sun Jun 18 14:36:03 2017 +0200
Committer: piotrz <piotrz@apache.org>
Committed: Sun Jun 18 14:36:03 2017 +0200

----------------------------------------------------------------------
 RELEASE_NOTES                                   |  1 +
 .../pom.xml                                     |  6 +--
 build.xml                                       | 17 +++++---
 .../flex/org/apache/flex/core/LayoutBase.as     | 36 ++++++++++++++++
 .../main/flex/org/apache/flex/core/UIBase.as    |  5 +++
 .../src/main/flex/org/apache/flex/core/View.as  |  2 +-
 .../main/flex/org/apache/flex/html/CheckBox.as  |  1 +
 .../main/flex/org/apache/flex/html/Slider.as    |  1 +
 .../html/beads/AccordionItemRendererView.as     | 25 ++++++++++-
 .../org/apache/flex/html/beads/GroupView.as     |  9 ++++
 .../flex/html/beads/NumericStepperView.as       | 44 +++++++++++++++-----
 .../org/apache/flex/html/beads/PanelView.as     | 15 +++----
 .../org/apache/flex/html/beads/SpinnerView.as   | 17 ++++++++
 .../beads/controllers/SliderMouseController.as  | 27 ++++++++----
 .../beads/controllers/SpinnerMouseController.as |  9 +++-
 .../html/beads/layouts/VerticalFlexLayout.as    | 14 +++++--
 .../apache/flex/html/beads/models/RangeModel.as |  6 ++-
 .../html/beads/models/RangeModelExtended.as     |  9 +++-
 .../flex/html/beads/models/ToggleButtonModel.as |  2 +-
 .../html/beads/models/ValueToggleButtonModel.as |  5 ++-
 .../supportClasses/AccordionItemRenderer.as     |  1 +
 .../Basic/src/main/resources/defaults.css       | 28 ++++++++-----
 .../beads/controllers/DropDownListController.as | 39 ++++++++---------
 .../FlexJSTest_Panel/src/MyInitialView.mxml     |  7 +++-
 .../java/src/marmotinni/MarmotinniRunner.java   |  9 ++++
 releasecandidate.xml                            | 36 ++++++++--------
 26 files changed, 274 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22a1145a/archetypes/flexjs-simple-application-pure-swf-archetype/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22a1145a/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22a1145a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/LayoutBase.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22a1145a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
index bff5886,1db7e23..432c8d2
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
@@@ -369,8 -369,10 +369,10 @@@ package org.apache.flex.cor
          {
              var pixels:Number;
              var strpixels:String = positioner.style.width as String;
 -            if (strpixels !== null && strpixels.indexOf('%') != -1)
 +            if (strpixels !== null && strpixels.indexOf('%') !== -1)
                  pixels = NaN;
+             else if (strpixels === "")
+             	pixels = NaN;
              else
                  pixels = parseFloat(strpixels);
              if (isNaN(pixels)) {
@@@ -461,8 -463,10 +463,10 @@@
          {
              var pixels:Number;
              var strpixels:String = positioner.style.height as String;
 -            if (strpixels !== null && strpixels.indexOf('%') != -1)
 +            if (strpixels !== null && strpixels.indexOf('%') !== -1)
                  pixels = NaN;
+             else if (strpixels === "")
+             	pixels = NaN;
              else
                  pixels = parseFloat(strpixels);
              if (isNaN(pixels)) {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/22a1145a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/AccordionItemRenderer.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/AccordionItemRenderer.as
index b720f47,65eed98..ff5ec2b
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/AccordionItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/AccordionItemRenderer.as
@@@ -115,10 -115,10 +115,11 @@@ package org.apache.flex.html.supportCla
  				var dataTitleModel:ITitleBarModel = dataAsStrand.getBeadByType(ITitleBarModel) as ITitleBarModel;
  				if (dataTitleModel)
  				{
 -					titleBar.model = dataTitleModel;
 +//					titleBar.model = dataTitleModel;
 +					titleBar.title = dataTitleModel.title; // temp fix. The line above should be swapoped
with this one once databinding works.
  				}
  			}
+ 			dispatchEvent(new Event("dataChange"));
  		}
  		
  		public function get listData():Object


Mime
View raw message