You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:13:07 UTC
[1/7] git commit: [flex-asjs] [refs/heads/dual] - add missing MIT
license text for Flat UI
Repository: flex-asjs
Updated Branches:
refs/heads/dual e08782236 -> b350e4de9
add missing MIT license text for Flat UI
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8e970e5b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8e970e5b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8e970e5b
Branch: refs/heads/dual
Commit: 8e970e5b0ac6c56c5f5c7cbbbbf07f091e133615
Parents: b7dc23b
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 25 09:03:13 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 25 09:03:13 2017 +1000
----------------------------------------------------------------------
LICENSE | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8e970e5b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 1918f0c..2c07af7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,7 +212,28 @@ conditions of the following licenses.
Portions of frameworks/projects/Flat/src/main/resources/defaults.css is based on
designmodo\u2019s (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 @@ The file frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Matrix.as
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
[4/7] flex-asjs git commit: call super.addedToParent first before checking for existence of IFormatBead’s
Posted by ah...@apache.org.
call super.addedToParent first before checking for existence of IFormatBead\u2019s
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90514e7e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90514e7e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90514e7e
Branch: refs/heads/dual
Commit: 90514e7e472455fb541e9e6cd5069e694cd0eb1b
Parents: 94e4647
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 25 09:06:44 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 25 09:06:44 2017 +1000
----------------------------------------------------------------------
.../main/flex/org/apache/flex/html/DateField.as | 33 +++++---------------
1 file changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90514e7e/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/DateField.as
----------------------------------------------------------------------
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 ca142ba..a4d9d27 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
@@ -67,34 +67,15 @@ package org.apache.flex.html
*/
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);
+ }
+ }
}
/**
[3/7] git commit: [flex-asjs] [refs/heads/dual] - update copyright
year
Posted by ah...@apache.org.
update copyright year
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/94e46477
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/94e46477
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/94e46477
Branch: refs/heads/dual
Commit: 94e46477235f4a1b2a71b1a0fe18dbb2fef42cfe
Parents: 10c19ee
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 25 09:04:17 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 25 09:04:17 2017 +1000
----------------------------------------------------------------------
examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml | 2 +-
examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +-
examples/flexjs/MapSearch/MapSearch-app.xml | 2 +-
examples/flexjs/MobileStocks/MobileStocks-app.xml | 2 +-
examples/flexjs/StorageExample/StorageExample-app.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94e46477/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
----------------------------------------------------------------------
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> -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94e46477/examples/flexjs/DesktopMap/DesktopMap-app.xml
----------------------------------------------------------------------
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> -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94e46477/examples/flexjs/MapSearch/MapSearch-app.xml
----------------------------------------------------------------------
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> -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94e46477/examples/flexjs/MobileStocks/MobileStocks-app.xml
----------------------------------------------------------------------
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> -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/94e46477/examples/flexjs/StorageExample/StorageExample-app.xml
----------------------------------------------------------------------
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> -->
[7/7] git commit: [flex-asjs] [refs/heads/dual] - Merge branch
'develop' into dual
Posted by ah...@apache.org.
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/dual
Commit: b350e4de95e985aa68b4a208c77aee3e9f357781
Parents: e087822 fd709d1
Author: Alex Harui <ah...@apache.org>
Authored: Sun Apr 30 20:07:46 2017 -0700
Committer: Alex Harui <ah...@apache.org>
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;
}
}
[5/7] git commit: [flex-asjs] [refs/heads/dual] - Express:
Application automatically adds an ApplicationDataBinding bead similar to how
Container automatically adds a ContainerDataBinding bead
Posted by ah...@apache.org.
Express: Application automatically adds an ApplicationDataBinding bead similar to how Container automatically adds a ContainerDataBinding bead
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c6b4f8a6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c6b4f8a6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c6b4f8a6
Branch: refs/heads/dual
Commit: c6b4f8a6570e7ff92415bd9049c66b2b2d53a10c
Parents: 90514e7
Author: Josh Tynjala <jo...@apache.org>
Authored: Wed Apr 26 15:51:55 2017 -0700
Committer: Josh Tynjala <jo...@apache.org>
Committed: Wed Apr 26 15:51:55 2017 -0700
----------------------------------------------------------------------
.../Express/src/main/flex/org/apache/flex/express/Application.as | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c6b4f8a6/frameworks/projects/Express/src/main/flex/org/apache/flex/express/Application.as
----------------------------------------------------------------------
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 @@ package org.apache.flex.express
super();
this.valuesImpl = new SimpleCSSValuesImpl();
+ addBead(new ApplicationDataBinding());
}
}
}
\ No newline at end of file
[6/7] git commit: [flex-asjs] [refs/heads/dual] - Explicitly set
position to absolute to fix slider button not moving
Posted by ah...@apache.org.
Explicitly set position to absolute to fix slider button not moving
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd709d13
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd709d13
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd709d13
Branch: refs/heads/dual
Commit: fd709d137e5f740fd3a7f7dfbcde0e898e25f103
Parents: c6b4f8a
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Authored: Fri Apr 28 06:46:32 2017 +0300
Committer: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
Committed: Fri Apr 28 06:46:32 2017 +0300
----------------------------------------------------------------------
frameworks/projects/Core/.actionScriptProperties | 1 +
frameworks/projects/Graphics/.actionScriptProperties | 1 +
frameworks/projects/HTML/.actionScriptProperties | 1 +
.../HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as | 4 ++++
4 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd709d13/frameworks/projects/Core/.actionScriptProperties
----------------------------------------------------------------------
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 @@ limitations under the License.
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd709d13/frameworks/projects/Graphics/.actionScriptProperties
----------------------------------------------------------------------
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 @@ limitations under the License.
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd709d13/frameworks/projects/HTML/.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 @@ limitations under the License.
<buildCSSFiles/>
<flashCatalyst validateFlashCatalystCompatibility="false"/>
</actionScriptProperties>
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd709d13/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
index ea31cf9..009fb8c 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SliderView.as
@@ -184,6 +184,10 @@ package org.apache.flex.html.beads
{
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;
}
}
[2/7] git commit: [flex-asjs] [refs/heads/dual] - update copyright
year
Posted by ah...@apache.org.
update copyright year
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/10c19ee3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/10c19ee3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/10c19ee3
Branch: refs/heads/dual
Commit: 10c19ee3f9333178825a6574678a8f2212806494
Parents: 8e970e5
Author: Justin Mclean <jm...@apache.org>
Authored: Tue Apr 25 09:03:33 2017 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Tue Apr 25 09:03:33 2017 +1000
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10c19ee3/NOTICE
----------------------------------------------------------------------
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/).