Merge branch 'develop' into dual
Conflicts:
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b350e4de
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b350e4de
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b350e4de
Branch: refs/heads/develop
Commit: b350e4de95e985aa68b4a208c77aee3e9f357781
Parents: e087822 fd709d1
Author: Alex Harui <[email protected]>
Authored: Sun Apr 30 20:07:46 2017 -0700
Committer: Alex Harui <[email protected]>
Committed: Sun Apr 30 20:07:46 2017 -0700
----------------------------------------------------------------------
LICENSE | 24 +++++++++++++-
NOTICE | 2 +-
.../CordovaCameraExample-app.xml | 2 +-
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
examples/flexjs/MapSearch/MapSearch-app.xml | 2 +-
.../flexjs/MobileStocks/MobileStocks-app.xml | 2 +-
.../StorageExample/StorageExample-app.xml | 2 +-
.../main/flex/org/apache/flex/html/DateField.as | 33 +++++---------------
.../org/apache/flex/html/beads/SliderView.as | 4 +++
.../projects/Core/.actionScriptProperties | 1 +
.../flex/org/apache/flex/express/Application.as | 2 ++
.../projects/Graphics/.actionScriptProperties | 1 +
.../projects/HTML/.actionScriptProperties | 1 +
13 files changed, 45 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b350e4de/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b350e4de/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SliderView.as
----------------------------------------------------------------------
diff --cc
frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SliderView.as
index ea31cf9,071dd8d..009fb8c
---
a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SliderView.as
+++
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SliderView.as
@@@ -183,7 -171,8 +183,11 @@@ package org.apache.flex.html.bead
private function setThumbPositionFromValue( value:Number ) :
void
{
var p:Number =
(value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum);
- var xloc:Number = p*(UIBase(_strand).width -
_thumb.width);
-
+ var xloc:Number = (p*_track.width);
++ COMPILE::JS
++ {
++ _thumb.element.style.position = 'absolute';
++ }
_thumb.x = xloc;
}
}
