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 2015/09/08 08:39:28 UTC
[1/5] git commit: [flex-asjs] [refs/heads/develop] - measure height
after layout
Repository: flex-asjs
Updated Branches:
refs/heads/develop 7c6a4cc07 -> 91e3f12c8
measure height after layout
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3ca1f7da
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3ca1f7da
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3ca1f7da
Branch: refs/heads/develop
Commit: 3ca1f7daa329bb9af9584930c86bb60c7661f87e
Parents: 7c6a4cc
Author: Alex Harui <ah...@apache.org>
Authored: Sat Sep 5 22:12:23 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Sep 5 22:12:23 2015 -0700
----------------------------------------------------------------------
.../flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3ca1f7da/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
index 2191645..5885678 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
@@ -209,7 +209,6 @@ package org.apache.flex.html.beads.layouts
mr = 0;
}
child.y = mt + padding.top;
- maxHeight = Math.max(maxHeight, mt + child.height + mb);
if (i == 0)
{
child.x = ml + padding.left;
@@ -217,6 +216,7 @@ package org.apache.flex.html.beads.layouts
}
else
child.x = xx - child.width - mr;
+ maxHeight = Math.max(maxHeight, mt + child.height + mb);
xx -= child.width + mr + ml;
lastmr = mr;
var valign:Object = ValuesManager.valuesImpl.getValue(child, "vertical-align");
[4/5] git commit: [flex-asjs] [refs/heads/develop] - update license,
notice and readme based on review by Justin
Posted by ah...@apache.org.
update license, notice and readme based on review by Justin
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fc1b0d01
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fc1b0d01
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fc1b0d01
Branch: refs/heads/develop
Commit: fc1b0d017231c4a4fa239596d430357230290625
Parents: 4916bc1
Author: Alex Harui <ah...@apache.org>
Authored: Sun Sep 6 21:36:42 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Sep 6 21:36:42 2015 -0700
----------------------------------------------------------------------
LICENSE | 5 +----
LICENSE.bin | 19 +++++++++++++------
NOTICE | 5 +----
READme | 45 ++++++++++++++++++++-------------------------
4 files changed, 35 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 1f3e388..21f2725 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,9 +210,6 @@ separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
-Portions of frameworks/projects/HTML/src/defaults.css is based on
+Portions of frameworks/projects/Flat/as/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
available under an MIT license.
-
-Google Closure Library is available under Apache License 2.0. For details
-see https://developers.google.com/closure/library/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 95ea89f..2c5e7a2 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -2,12 +2,19 @@ Below are the licenses for components included in the binary distribution.
------------------------------------------------------------------------------------------
-frameworks/fonts/flat-ui-icons-regular.eot
-frameworks/fonts/flat-ui-icons-regular.ttf
-frameworks/fonts/flat-ui-icons-regular.svg
-frameworks/fonts/flat-ui-icons-regular.woff
-
This product bundles designmodo’s (http://designmodo.com/flat-free/)
Flat UI glyph fonts available under an MIT license. For details, see
-
frameworks/fonts/README.md
+
+This product bundles Google Closure Library available under Apache License 2.0.
+For details see https://developers.google.com/closure/library/
+
+Google Closure Library appears to bundle:
+- Mochikit, available under MIT License. See:
+ js/lib/google/closure-library/third_party/closure/goog/mochikit
+- SVGPan, available under a “2-clause” BSD License. See:
+ js/lib/google/closure-library/third_party/closure/goog/svgpan/svgpan.js
+- Dojo, available under a “3-clause” BSD License. See:
+ js/lib/google/closure-library/third_party/closure/goog/dojo/dom/query.js
+- JPEG Encoder, available under a “3-clause” BSD License. See:
+ js/lib/google/closure-library/third_party/closure/goog/jpeg_encoder/jpeg_encoder_basic.js
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index ab4cb3d..76f24f4 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,8 +1,5 @@
Apache FlexJS
-Copyright 2014 The Apache Software Foundation
+Copyright 2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-Google Closure Library is available under Apache License 2.0. For details
-see https://developers.google.com/closure/library/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc1b0d01/READme
----------------------------------------------------------------------
diff --git a/READme b/READme
index 8d93209..e8a799e 100644
--- a/READme
+++ b/READme
@@ -25,27 +25,19 @@ Getting the latest sources via git
You can always checkout the latest source via git using the following
command:
- git clone https://git-wip-us.apache.org/repos/asf/flex-asjs.git asjs
- cd asjs
+ git clone https://git-wip-us.apache.org/repos/asf/flex-asjs.git flex-asjs
+ cd flex-asjs
git checkout develop
- The Apache Flex Compiler also requires code from other Apache Flex git
- repositories or an Apache Flex SDK. To get the latest source via git
- for the Apache Flex SDK use the following command:
-
- git clone https://git-wip-us.apache.org/repos/asf/flex-sdk.git sdk
- cd sdk
- git checkout develop
-
- The Apache Flex SDK requires the Text Layout Framework repository which
- you can get as follows:
-
- git clone https://git-wip-us.apache.org/repos/asf/flex-tlf.git tlf
- cd tlf
- git checkout develop
+ Apache FlexJS also requires code from several other Apache Flex git
+ repositories. To get the latest sources via git, first follow the
+ instructions in ‘Install Prerequisites’, then from the flex-asjs
+ directory, run:
+
+ ant all
- To use an Apache Flex SDK, install an Apache Flex SDK on your computer and
- follow the instructions in 'Install Prerequisites'.
+ This will clone all of the upstream repositories, checkout the develop branches
+ then run the builds in those repositories in the correct order.
Building Apache FlexJS
======================
@@ -200,26 +192,29 @@ Install Prerequisites
environment variables. On OSX some folks had permission issues after
the install. See their documentation on using -g and sudo.
- *9) Set FALCON_HOME to the root of its SDK. When using the flex-falcon
- repository, set
+ *9) Set FALCON_HOME to the root of its SDK. If you have cloned the flex-falcon
+ repository as a sibling of the flex-asjs repository, you don’t need to
+ set this variable, otherwise, set it as:
FALCON_HOME=<repo-path>/compiler/generated/dist/sdk
Look at flex-falcon/README for instructions on how to build Falcon
- *10) Set FALCONJX_HOME to the root of its SDK. When using the flex-falcon
- repository, set
+ *10) Set FALCONJX_HOME to the root of its SDK. If you have cloned the flex-falcon
+ repositoryas a sibling of the flex-asjs repository, you don’t need to
+ set this variable, otherwise, set it as
FALCONJX_HOME=<repo-path>/compiler.jx
Look at flex-falcon/README_JX for instructions on how to build FalconJX
- *11) Set FLEXUNIT_HOME to the root of a FlexUnit release or repo.
+ *11) Set FLEXUNIT_HOME to the root of a FlexUnit release or repo. If you
+ have cloned the flex-flexunit repository as a sibling of the flex-asjs
+ repository, you don’t need to set this variable.
Look at flex-flexunit/README for instructions on how to build FlexUnit
Software Dependencies
---------------------
- The Apache FlexJS framework does not have direct dependencies on third-party
- software. Applications built with Apache FlexJS need the Google Closure Library.
+ The Apache FlexJS framework depends on the Google Closure Library.
Using the Binary Distribution
-----------------------------
[2/5] git commit: [flex-asjs] [refs/heads/develop] - when % width,
you get fractional numbers yet offsetWidth rounds down,
so check the computed width which will include the fractional part,
otherwise you'll get a half-pixel gap
Posted by ah...@apache.org.
when % width, you get fractional numbers yet offsetWidth rounds down, so check the computed width which will include the fractional part, otherwise you'll get a half-pixel gap
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/606b28bf
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/606b28bf
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/606b28bf
Branch: refs/heads/develop
Commit: 606b28bfe9f6c9275069db97b4868b26f2ef75ac
Parents: 3ca1f7d
Author: Alex Harui <ah...@apache.org>
Authored: Sat Sep 5 22:13:18 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Sep 5 22:13:18 2015 -0700
----------------------------------------------------------------------
.../HTML/js/src/org/apache/flex/html/beads/PanelView.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/606b28bf/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
index f4132ef..3965772 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/PanelView.js
@@ -110,18 +110,21 @@ org.apache.flex.html.beads.PanelView.
prototype.layoutViewBeforeContentLayout = function() {
var vm = this.viewportModel;
var host = this._strand;
-
+ var w = host.width;
+ var s = window.getComputedStyle(host.element);
+ var sw = Number(s.width.substring(0, s.width.length - 2));
+ if (sw > w) w = sw;
vm.borderMetrics = org.apache.flex.utils.CSSContainerUtils.getBorderMetrics(host);
this.titleBar.x = 0;
this.titleBar.y = 0;
if (!host.isWidthSizedToContent())
- this.titleBar.width = host.width - vm.borderMetrics.left - vm.borderMetrics.right;
+ this.titleBar.width = w - vm.borderMetrics.left - vm.borderMetrics.right;
vm.chromeMetrics = this.getChromeMetrics();
this.viewport.setPosition(vm.chromeMetrics.left,
vm.chromeMetrics.top);
this.viewport.layoutViewportBeforeContentLayout(
!host.isWidthSizedToContent() ?
- host.width - vm.borderMetrics.left - vm.borderMetrics.right -
+ w - vm.borderMetrics.left - vm.borderMetrics.right -
vm.chromeMetrics.left - vm.chromeMetrics.right : NaN,
!host.isHeightSizedToContent() ?
host.height - vm.borderMetrics.top - vm.borderMetrics.bottom -
[5/5] git commit: [flex-asjs] [refs/heads/develop] - tweak approval
script
Posted by ah...@apache.org.
tweak approval script
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/91e3f12c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/91e3f12c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/91e3f12c
Branch: refs/heads/develop
Commit: 91e3f12c8100499db2924d5b1f67e84578fcd895
Parents: fc1b0d0
Author: Alex Harui <ah...@apache.org>
Authored: Mon Sep 7 23:39:47 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Sep 7 23:39:47 2015 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/91e3f12c/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index d9682f6..5a3736e 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -277,7 +277,11 @@
<exclude name="**/*.jpg"/>
<exclude name="**/*.mp3"/>
<exclude name="**/*.flv"/>
+ <!-- JSON doesn't really have a comment format -->
+ <exclude name="**/*.json"/>
+ <!-- JSHint properties file -->
<exclude name="frameworks/js/jshint.properties"/>
+ <exclude name="frameworks/js/.jshintrc"/>
</fileset>
</rat:report>
<antcall target="display-text" >
@@ -290,7 +294,8 @@
addproperty="rat.license.ok"/>
<echo>filtering out AL files to make it easier to see binary files</echo>
<copy file="${rat.report}" tofile="${rat.report}.bin.txt" />
- <replaceregexp file="${rat.report}.bin.txt" match="..AL.*" replace="" byline="true"/>
+ <replaceregexp file="${rat.report}.bin.txt" match="..AL.*" replace="__AL" byline="true"/>
+ <replaceregexp file="${rat.report}.bin.txt" flags="gs" match="__AL." replace="" byline="false"/>
<antcall target="display-text" >
<param name="file" value="${rat.report}.bin.txt" />
</antcall>
[3/5] git commit: [flex-asjs] [refs/heads/develop] - 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/4916bc1e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4916bc1e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4916bc1e
Branch: refs/heads/develop
Commit: 4916bc1e5b25fdc4f6413627d11fa557be507558
Parents: 606b28b
Author: Alex Harui <ah...@apache.org>
Authored: Sun Sep 6 21:35:51 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Sep 6 21:35:51 2015 -0700
----------------------------------------------------------------------
.../flexjs/CordovaCameraExample/CordovaCameraExample-app.xml | 4 ++--
examples/flexjs/DesktopMap/DesktopMap-app.xml | 4 ++--
examples/flexjs/MapSearch/MapSearch-app.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4916bc1e/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
index 7a5ed64..e3bc1ff 100644
--- a/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
+++ b/examples/flexjs/CordovaCameraExample/CordovaCameraExample-app.xml
@@ -45,7 +45,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>0.0.1</versionNumber>
+ <versionNumber>0.5.0</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2013 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2015 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/4916bc1e/examples/flexjs/DesktopMap/DesktopMap-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/DesktopMap-app.xml b/examples/flexjs/DesktopMap/DesktopMap-app.xml
index 8beb581..4b6c86b 100644
--- a/examples/flexjs/DesktopMap/DesktopMap-app.xml
+++ b/examples/flexjs/DesktopMap/DesktopMap-app.xml
@@ -45,7 +45,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>0.0.1</versionNumber>
+ <versionNumber>0.5.0</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2013 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2015 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/4916bc1e/examples/flexjs/MapSearch/MapSearch-app.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/MapSearch-app.xml b/examples/flexjs/MapSearch/MapSearch-app.xml
index 5cf1d99..c2f3dc8 100644
--- a/examples/flexjs/MapSearch/MapSearch-app.xml
+++ b/examples/flexjs/MapSearch/MapSearch-app.xml
@@ -45,7 +45,7 @@
<!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade.
Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
An updated version of application must have a versionNumber value higher than the previous version. Required for namespace >= 2.5 . -->
- <versionNumber>0.0.1</versionNumber>
+ <versionNumber>0.5.0</versionNumber>
<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
@@ -55,7 +55,7 @@
<!-- <description></description> -->
<!-- Copyright information. Optional -->
- <copyright>Copyright 2013 The Apache Software Foundation.</copyright>
+ <copyright>Copyright 2015 The Apache Software Foundation.</copyright>
<!-- Publisher ID. Used if you're updating an application created prior to 1.5.3 -->
<!-- <publisherID></publisherID> -->