Merge branch 'develop' into dual
Conflicts:
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
diff --git a/LICENSE b/LICENSE
index 1918f0c..2c07af7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,7 +212,28 @@
Portions of frameworks/projects/Flat/src/main/resources/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
-available under an MIT license.
+available under an MIT license.
+
+The MIT License (MIT)
+Copyright (c) 2013-2016 Designmodo
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
The map image in examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
was placed into the Public Domain by its author. See:
@@ -230,6 +251,7 @@
is derived from OpenFL (https://github.com/openfl) which is available under an
MIT License.
+The MIT License (MIT)
Copyright (c) 2013-2016 Joshua Granick and other OpenFL contributors
Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/NOTICE b/NOTICE
index 21cb1dc..9348fd5 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache FlexJS
-Copyright 2012-2016 The Apache Software Foundation
+Copyright 2012-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
index 7c9a0ad..2e94c41 100644
--- a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
+++ b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2016 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2017 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
diff --git a/examples/flexjs/DesktopMap/DesktopMap-app.xml b/examples/flexjs/DesktopMap/DesktopMap-app.xml
index 247bb2d..7d93fd8 100644
--- a/examples/flexjs/DesktopMap/DesktopMap-app.xml
+++ b/examples/flexjs/DesktopMap/DesktopMap-app.xml
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2016 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2017 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
diff --git a/examples/flexjs/MapSearch/MapSearch-app.xml b/examples/flexjs/MapSearch/MapSearch-app.xml
index 747b29c..b048d99 100644
--- a/examples/flexjs/MapSearch/MapSearch-app.xml
+++ b/examples/flexjs/MapSearch/MapSearch-app.xml
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2016 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2017 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
diff --git a/examples/flexjs/MobileStocks/MobileStocks-app.xml b/examples/flexjs/MobileStocks/MobileStocks-app.xml
index e673bc5..f604d85 100644
--- a/examples/flexjs/MobileStocks/MobileStocks-app.xml
+++ b/examples/flexjs/MobileStocks/MobileStocks-app.xml
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2016 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2017 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
diff --git a/examples/flexjs/StorageExample/StorageExample-app.xml b/examples/flexjs/StorageExample/StorageExample-app.xml
index 2e6e858..33cf0cf 100644
--- a/examples/flexjs/StorageExample/StorageExample-app.xml
+++ b/examples/flexjs/StorageExample/StorageExample-app.xml
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2016 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2017 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as
index 5b73db0..c953773 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as
@@ -68,34 +68,15 @@
*/
override public function addedToParent():void
{
- var klass:* = ValuesManager.valuesImpl.getValue(this,"iFormatBead");
- var bead:IBead = new klass() as IBead;
- if (bead) {
- addBead(bead);
- }
-
super.addedToParent();
- }
- /**
- * Replace existing format bead if it exists.
- *
- * @copy org.apache.flex.core.IStrand#addBead()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function addBead(bead:IBead):void
- {
- if (bead is IFormatBead) {
- var formatBead:IBead = getBeadByType(IFormatBead);
- if (formatBead != null) {
- removeBead(formatBead);
- }
- }
- super.addBead(bead);
+ if (getBeadByType(IFormatBead) == null) {
+ var klass:* = ValuesManager.valuesImpl.getValue(this, "iFormatBead");
+ var bead:IBead = new klass() as IBead;
+ if (bead) {
+ addBead(bead);
+ }
+ }
}
/**
diff --git 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
index ea31cf9..009fb8c 100644
--- 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
@@ -184,6 +184,10 @@
{
var p:Number = (value-rangeModel.minimum)/(rangeModel.maximum-rangeModel.minimum);
var xloc:Number = (p*_track.width);
+ COMPILE::JS
+ {
+ _thumb.element.style.position = 'absolute';
+ }
_thumb.x = xloc;
}
}
diff --git a/frameworks/projects/Core/.actionScriptProperties b/frameworks/projects/Core/.actionScriptProperties
index b29cfae..0a9a092 100644
--- a/frameworks/projects/Core/.actionScriptProperties
+++ b/frameworks/projects/Core/.actionScriptProperties
@@ -55,3 +55,4 @@
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
diff --git a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
index 1199dd5..8a13afd 100644
--- a/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
+++ b/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.express
{
+ import org.apache.flex.binding.ApplicationDataBinding;
import org.apache.flex.core.Application;
import org.apache.flex.core.SimpleCSSValuesImpl;
@@ -32,6 +33,7 @@
super();
this.valuesImpl = new SimpleCSSValuesImpl();
+ addBead(new ApplicationDataBinding());
}
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Graphics/.actionScriptProperties b/frameworks/projects/Graphics/.actionScriptProperties
index 355befe..c93a464 100644
--- a/frameworks/projects/Graphics/.actionScriptProperties
+++ b/frameworks/projects/Graphics/.actionScriptProperties
@@ -36,3 +36,4 @@
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
diff --git a/frameworks/projects/HTML/.actionScriptProperties b/frameworks/projects/HTML/.actionScriptProperties
index f491247..1897941 100644
--- a/frameworks/projects/HTML/.actionScriptProperties
+++ b/frameworks/projects/HTML/.actionScriptProperties
@@ -39,3 +39,4 @@
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
