You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/18 15:26:24 UTC
[01/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- add flag to XML cross-compile:
Repository: flex-asjs
Updated Branches:
refs/heads/feature/maven-migration 203782597 -> db775a05a
add flag to XML cross-compile:
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1ffb32f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1ffb32f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1ffb32f5
Branch: refs/heads/feature/maven-migration
Commit: 1ffb32f53c63f3d31ee2cb8fefa5f26ae1482f5c
Parents: 916989a
Author: Alex Harui <ah...@apache.org>
Authored: Fri Feb 19 10:53:32 2016 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Feb 19 10:53:32 2016 -0800
----------------------------------------------------------------------
frameworks/projects/XML/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1ffb32f5/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index dd46000..6251bd9 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -109,6 +109,7 @@
<jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
<arg value="+flexlib=${FLEX_HOME}/frameworks" />
<arg value="-js-output-type=FLEXJS" />
+ <arg value="-compiler.strict-xml=true" />
<arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations -->
<arg value="-output=${basedir}/target/generated-sources/flexjs" />
<arg value="-load-config=${basedir}/src/main/resources/compile-asjs-config.xml" />
[10/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix gpg check for docs in approval script
Posted by cd...@apache.org.
fix gpg check for docs in 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/bfc904cb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bfc904cb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bfc904cb
Branch: refs/heads/feature/maven-migration
Commit: bfc904cbc1aef3824b9424f42dc69d352f305f0a
Parents: 8009ec0
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 22:22:08 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 22:22:08 2016 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bfc904cb/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 2c2a436..12341ad 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -298,8 +298,8 @@
</exec>
<exec executable="gpg" failonerror="true">
<arg value="--verify" />
- <arg value="${basedir}/${doc.package.url.name}.${package.suffix}.asc" />
- <arg value="${basedir}/${doc.package.url.name}.${package.suffix}" />
+ <arg value="${basedir}/${doc.package.url.name}.zip.asc" />
+ <arg value="${basedir}/${doc.package.url.name}.zip" />
</exec>
</target>
[50/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Merge branches 'develop' and 'feature/maven-migration' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into
feature/maven-migration
Posted by cd...@apache.org.
Merge branches 'develop' and 'feature/maven-migration' of https://git-wip-us.apache.org/repos/asf/flex-asjs into feature/maven-migration
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/db775a05
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/db775a05
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/db775a05
Branch: refs/heads/feature/maven-migration
Commit: db775a05ac5199ad851ffe5bc48957d7b4fa13a9
Parents: 2037825 cf8933e
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Apr 17 18:16:31 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Apr 17 18:16:31 2016 +0200
----------------------------------------------------------------------
ApproveFlexJS.xml | 127 +-
LICENSE | 4 +-
LICENSE.base | 203 ++
LICENSE.bin | 4 -
apache-flex-flexjs-installer-config.xml | 29 +
build.properties | 2 +-
build.xml | 50 +-
examples/build_example.xml | 6 +-
.../AngularExample/AngularExample-debug.html | 28 +
.../AngularExample/AngularExample-release.html | 29 +
.../native/AngularExample/src/AngularExample.as | 66 +
.../native/AngularExample/src/MyController.as | 52 +
.../src/components/IWebComponent.as | 9 +
.../src/components/WebComponent.as | 20 +
.../src/components/mdbutton/MDButton.as | 43 +
.../src/components/mdbutton/MDButtonFactory.as | 38 +
frameworks/build.xml | 10 +-
frameworks/downloads.xml | 94 +-
.../projects/Core/src/main/flex/Namespace.as | 129 +-
frameworks/projects/Core/src/main/flex/QName.as | 167 +-
.../flex/org/apache/flex/core/Application.as | 7 +-
frameworks/projects/XML/build.xml | 216 ++
frameworks/projects/XML/src/main/flex/XML.as | 2392 ++++++++++++++++++
.../projects/XML/src/main/flex/XMLClasses.as | 37 +
.../projects/XML/src/main/flex/XMLList.as | 764 ++++++
.../XML/src/main/resources/basic-manifest.xml | 24 +
.../src/main/resources/compile-asjs-config.xml | 79 +
.../XML/src/main/resources/compile-config.xml | 78 +
.../FlexJS (FalconJX Debug Build).launch | 28 +
...JS (FalconJX Debug and Release Build).launch | 2 +-
installer.properties/en_US.properties | 14 +
installer.xml | 84 +-
manualtests/XMLTest/build.xml | 72 +
manualtests/XMLTest/src/MyInitialView.mxml | 252 ++
manualtests/XMLTest/src/README.txt | 45 +
manualtests/XMLTest/src/XMLTest.mxml | 40 +
.../XMLTest/src/controllers/MyController.as | 52 +
manualtests/XMLTest/src/models/MyModel.as | 125 +
manualtests/build_example.xml | 2 +-
marmotinni/java/downloads.xml | 6 +-
mustella/js/AssertPropertyValue.js | 37 +
mustella/js/DispatchMouseClickEvent.js | 37 +
mustella/js/DispatchMouseEvent.js | 37 +
mustella/js/ExitWhenDone.js | 37 +
mustella/js/SendFormattedResultsToLog.js | 37 +
mustella/js/SetProperty.js | 37 +
mustella/js/SetShowRTE.js | 37 +
mustella/js/TestCase.js | 37 +
mustella/js/UnitTester.js | 37 +
nightly.properties | 2 +-
releasecandidate.xml | 9 +-
51 files changed, 5658 insertions(+), 115 deletions(-)
----------------------------------------------------------------------
[16/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- typo
Posted by cd...@apache.org.
typo
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1c5e98db
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1c5e98db
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1c5e98db
Branch: refs/heads/feature/maven-migration
Commit: 1c5e98db9ceb3ca115715d4459d770ba23d35c4f
Parents: dbcc3b1
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 6 18:48:54 2016 -0700
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 6 18:48:54 2016 -0700
----------------------------------------------------------------------
manualtests/XMLTest/src/MyInitialView.mxml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c5e98db/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index 0f9eab0..c611565 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -37,23 +37,16 @@ limitations under the License.
import org.apache.flex.events.Event;
import org.apache.flex.utils.UIUtils;
- import org.apache.flex.reflection.describeType;
- import org.apache.flex.reflection.MetaDataArgDefinition;
- import org.apache.flex.reflection.MetaDataDefinition;
- import org.apache.flex.reflection.MethodDefinition;
- import org.apache.flex.reflection.TypeDefinition;
-
+ import XML;
+
[Event(name="foo", type="org.apache.flex.events.Event")]
public function runTest():void
{
- var metadata:Array;
- var mtd:MetaDataDefinition;
- var mtdarg:MetaDataArgDefinition;
var args:Array;
var j:int;
var m:int;
var xml1:XML = <foo baz="true"/>;
- trace(xmll1);
+ trace(xml1);
trace(xml1.baz);
}
[31/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- More XML issues
Posted by cd...@apache.org.
More XML issues
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/60670ecb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/60670ecb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/60670ecb
Branch: refs/heads/feature/maven-migration
Commit: 60670ecba5b25de896ecb7ac7373ff483811a196
Parents: 9d44fa9
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 13:13:36 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 13:13:36 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 26 +++++++++++++++--------
1 file changed, 17 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/60670ecb/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 9b9c475..7d47fca 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -779,16 +779,16 @@ package
if(name.matches(_attributes[i].name()))
list.appendChild(_attributes[i]);
}
- for(i=0;i<_children.length;i++)
+ }
+ for(i=0;i<_children.length;i++)
+ {
+ if(_children[i].nodeKind() == "element")
{
- if(_children[i].nodeKind() == "element")
- {
- if(name.matches(_children[i].name()))
- list.appendChild(_children[i]);
+ if(name.matches(_children[i].name()))
+ list.appendChild(_children[i]);
- list.concat(_children[i].descendants());
- }
- }
+ list.concat(_children[i].descendants());
+ }
}
return list;
}
@@ -1407,7 +1407,15 @@ package
COMPILE::JS
public function processingInstructions(name:String = "*"):XMLList
{
- return null;
+ var i:int;
+ var list:XMLList = new XMLList();
+ for(i=0;i<_children.length;i++)
+ {
+ if(_children[i].nodeKind() == "processing-instruction")
+ list.appendChild(_children[i]);
+ }
+ list.targetObject = this;
+ return list;
}
/**
[41/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- removed unnecessary variable
Posted by cd...@apache.org.
removed unnecessary variable
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7e660ea7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7e660ea7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7e660ea7
Branch: refs/heads/feature/maven-migration
Commit: 7e660ea7fb7c5cefdecd794ff8797de675981481
Parents: 923fc78
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 13 00:29:11 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 13 00:29:11 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XMLList.as | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7e660ea7/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index 6b3e3d2..0dac7af 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -664,8 +664,7 @@ package
COMPILE::JS
public function setChild(elementName:*, elements:Object):void
{
- var len:int = _xmlArray.length;
- if(len == 1)
+ if(_xmlArray.length == 1)
_xmlArray[0].setChild(elementName,elements);
}
[43/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix nightly
Posted by cd...@apache.org.
fix nightly
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ba6eda56
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ba6eda56
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ba6eda56
Branch: refs/heads/feature/maven-migration
Commit: ba6eda56c59331554cd62dc669f2837e8cb1e2c4
Parents: 3f065a2
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 23:46:46 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
nightly.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba6eda56/nightly.properties
----------------------------------------------------------------------
diff --git a/nightly.properties b/nightly.properties
index 3b96ceb..90de624 100644
--- a/nightly.properties
+++ b/nightly.properties
@@ -23,7 +23,7 @@ nightly = true
falcon.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.md5.server.url = http://apacheflexbuild.cloudapp.net:8080
falcon.folder = job/flex-falcon/lastSuccessfulBuild/artifact/out
-falcon.version = 0.6.0
+falcon.version = 0.7.0
#need this until Installer 3.2 comes out
#jburg.server=http://downloads.sourceforge.net
#jburg.folder=project/jburg
[36/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- try to fix checkintests with temporary JS stubs
Posted by cd...@apache.org.
try to fix checkintests with temporary JS stubs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6f339dcb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6f339dcb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6f339dcb
Branch: refs/heads/feature/maven-migration
Commit: 6f339dcbe066083ac4fbcc9eadf085dbe7db4e70
Parents: fdbc359
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 11 22:00:15 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 11 22:00:25 2016 -0700
----------------------------------------------------------------------
build.xml | 2 ++
mustella/js/AssertPropertyValue.js | 37 +++++++++++++++++++++++++++
mustella/js/DispatchMouseClickEvent.js | 37 +++++++++++++++++++++++++++
mustella/js/DispatchMouseEvent.js | 37 +++++++++++++++++++++++++++
mustella/js/ExitWhenDone.js | 37 +++++++++++++++++++++++++++
mustella/js/SendFormattedResultsToLog.js | 37 +++++++++++++++++++++++++++
mustella/js/SetProperty.js | 37 +++++++++++++++++++++++++++
mustella/js/SetShowRTE.js | 37 +++++++++++++++++++++++++++
mustella/js/TestCase.js | 37 +++++++++++++++++++++++++++
mustella/js/UnitTester.js | 37 +++++++++++++++++++++++++++
10 files changed, 335 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 89d5e5c..43e0a6a 100644
--- a/build.xml
+++ b/build.xml
@@ -1147,8 +1147,10 @@
<arg value="-compiler.binding-value-change-event-type=valueChange" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-library-path+=${FLEX_SDK_HOME}/mustella/mustella.swc" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/mustella/js" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<arg value="${basedir}/mustella/tests/basicTests/BasicTestsApp.mxml" />
</java>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/AssertPropertyValue.js
----------------------------------------------------------------------
diff --git a/mustella/js/AssertPropertyValue.js b/mustella/js/AssertPropertyValue.js
new file mode 100644
index 0000000..b7c4e5b
--- /dev/null
+++ b/mustella/js/AssertPropertyValue.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * AssertPropertyValue (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('AssertPropertyValue');
+
+
+
+/**
+ * @class
+ */
+AssertPropertyValue = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+AssertPropertyValue.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/DispatchMouseClickEvent.js
----------------------------------------------------------------------
diff --git a/mustella/js/DispatchMouseClickEvent.js b/mustella/js/DispatchMouseClickEvent.js
new file mode 100644
index 0000000..69c9851
--- /dev/null
+++ b/mustella/js/DispatchMouseClickEvent.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * DispatchMouseClickEvent (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('DispatchMouseClickEvent');
+
+
+
+/**
+ * @class
+ */
+DispatchMouseClickEvent = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+DispatchMouseClickEvent.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/DispatchMouseEvent.js
----------------------------------------------------------------------
diff --git a/mustella/js/DispatchMouseEvent.js b/mustella/js/DispatchMouseEvent.js
new file mode 100644
index 0000000..3cb3ec5
--- /dev/null
+++ b/mustella/js/DispatchMouseEvent.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * DispatchMouseEvent (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('DispatchMouseEvent');
+
+
+
+/**
+ * @class
+ */
+DispatchMouseEvent = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+DispatchMouseEvent.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/ExitWhenDone.js
----------------------------------------------------------------------
diff --git a/mustella/js/ExitWhenDone.js b/mustella/js/ExitWhenDone.js
new file mode 100644
index 0000000..df13031
--- /dev/null
+++ b/mustella/js/ExitWhenDone.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * ExitWhenDone (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('ExitWhenDone');
+
+
+
+/**
+ * @class
+ */
+ExitWhenDone = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+ExitWhenDone.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/SendFormattedResultsToLog.js
----------------------------------------------------------------------
diff --git a/mustella/js/SendFormattedResultsToLog.js b/mustella/js/SendFormattedResultsToLog.js
new file mode 100644
index 0000000..09c0603
--- /dev/null
+++ b/mustella/js/SendFormattedResultsToLog.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SendFormattedResultsToLog (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('SendFormattedResultsToLog');
+
+
+
+/**
+ * @class
+ */
+SendFormattedResultsToLog = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+SendFormattedResultsToLog.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/SetProperty.js
----------------------------------------------------------------------
diff --git a/mustella/js/SetProperty.js b/mustella/js/SetProperty.js
new file mode 100644
index 0000000..d93f990
--- /dev/null
+++ b/mustella/js/SetProperty.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SetProperty (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('SetProperty');
+
+
+
+/**
+ * @class
+ */
+SetProperty = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+SetProperty.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/SetShowRTE.js
----------------------------------------------------------------------
diff --git a/mustella/js/SetShowRTE.js b/mustella/js/SetShowRTE.js
new file mode 100644
index 0000000..307d45c
--- /dev/null
+++ b/mustella/js/SetShowRTE.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * SetShowRTE (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('SetShowRTE');
+
+
+
+/**
+ * @class
+ */
+SetShowRTE = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+SetShowRTE.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/TestCase.js
----------------------------------------------------------------------
diff --git a/mustella/js/TestCase.js b/mustella/js/TestCase.js
new file mode 100644
index 0000000..6f42929
--- /dev/null
+++ b/mustella/js/TestCase.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * TestCase (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('TestCase');
+
+
+
+/**
+ * @class
+ */
+TestCase = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+TestCase.init = function(c) {};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6f339dcb/mustella/js/UnitTester.js
----------------------------------------------------------------------
diff --git a/mustella/js/UnitTester.js b/mustella/js/UnitTester.js
new file mode 100644
index 0000000..61b7e29
--- /dev/null
+++ b/mustella/js/UnitTester.js
@@ -0,0 +1,37 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * UnitTester (stub, not used)
+ *
+ * @fileoverview
+ *
+ * @suppress {checkTypes}
+ */
+
+goog.provide('UnitTester');
+
+
+
+/**
+ * @class
+ */
+UnitTester = function() {
+};
+
+
+/**
+ * @param {Object} c
+ */
+UnitTester.init = function(c) {};
[14/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- switch nightly to 0.7.0
Posted by cd...@apache.org.
switch nightly to 0.7.0
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd130d75
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd130d75
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd130d75
Branch: refs/heads/feature/maven-migration
Commit: fd130d7595bae63b3a9547c5c766d6a87c1fb26c
Parents: 781d38e
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 4 13:01:36 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 4 13:01:36 2016 -0700
----------------------------------------------------------------------
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd130d75/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 1742c34..a494011 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
release.name = Apache Flex (FlexJS)
# this is the version that appears in the flex-sdk-description <description> tag
# and on the package name. This is the publicly known version of FlexJS
-release.version = 0.6.0
+release.version = 0.7.0
# fb.release.version must start with 4 in order for FB to accept it.
# intellij seems to want it to be at least 4.6 in order to not use certain
[17/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- More typos
Posted by cd...@apache.org.
More typos
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/51bbbac8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/51bbbac8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/51bbbac8
Branch: refs/heads/feature/maven-migration
Commit: 51bbbac84fea710ead3055749743789856c29725
Parents: 1c5e98d
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 6 20:35:02 2016 -0700
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 6 20:35:02 2016 -0700
----------------------------------------------------------------------
manualtests/XMLTest/build.xml | 2 +-
manualtests/XMLTest/src/ReflectionTest.mxml | 40 --------------------
manualtests/XMLTest/src/XMLTest.mxml | 40 ++++++++++++++++++++
.../XMLTest/src/controllers/MyController.as | 6 +--
4 files changed, 44 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/51bbbac8/manualtests/XMLTest/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/build.xml b/manualtests/XMLTest/build.xml
index 6370e2d..5f352b6 100644
--- a/manualtests/XMLTest/build.xml
+++ b/manualtests/XMLTest/build.xml
@@ -21,7 +21,7 @@
<project name="xmltest" default="main" basedir=".">
<property name="FLEXJS_HOME" location="../.."/>
- <property name="example" value="ReflectionTest" />
+ <property name="example" value="XMLTest" />
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/51bbbac8/manualtests/XMLTest/src/ReflectionTest.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/ReflectionTest.mxml b/manualtests/XMLTest/src/ReflectionTest.mxml
deleted file mode 100644
index 27e97b5..0000000
--- a/manualtests/XMLTest/src/ReflectionTest.mxml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
--->
-<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:local="*"
- xmlns:models="models.*"
- xmlns:controllers="controllers.*"
- xmlns:js="library://ns.apache.org/flexjs/basic"
- >
-
- <js:valuesImpl>
- <js:SimpleCSSValuesImpl />
- </js:valuesImpl>
- <js:controller>
- <controllers:MyController />
- </js:controller>
- <js:model>
- <models:MyModel />
- </js:model>
- <js:initialView>
- <local:MyInitialView />
- </js:initialView>
-</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/51bbbac8/manualtests/XMLTest/src/XMLTest.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/XMLTest.mxml b/manualtests/XMLTest/src/XMLTest.mxml
new file mode 100644
index 0000000..27e97b5
--- /dev/null
+++ b/manualtests/XMLTest/src/XMLTest.mxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+-->
+<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:local="*"
+ xmlns:models="models.*"
+ xmlns:controllers="controllers.*"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ >
+
+ <js:valuesImpl>
+ <js:SimpleCSSValuesImpl />
+ </js:valuesImpl>
+ <js:controller>
+ <controllers:MyController />
+ </js:controller>
+ <js:model>
+ <models:MyModel />
+ </js:model>
+ <js:initialView>
+ <local:MyInitialView />
+ </js:initialView>
+</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/51bbbac8/manualtests/XMLTest/src/controllers/MyController.as
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/controllers/MyController.as b/manualtests/XMLTest/src/controllers/MyController.as
index 81eb963..679d638 100644
--- a/manualtests/XMLTest/src/controllers/MyController.as
+++ b/manualtests/XMLTest/src/controllers/MyController.as
@@ -31,12 +31,12 @@ package controllers
{
if (app)
{
- this.app = app as ReflectionTest;
+ this.app = app as XMLTest;
app.addEventListener("viewChanged", viewChangeHandler);
}
}
- private var app:ReflectionTest;
+ private var app:XMLTest;
private function viewChangeHandler(event:Event):void
{
@@ -44,7 +44,7 @@ package controllers
public function setDocument(document:Object, id:String = null):void
{
- this.app = document as ReflectionTest;
+ this.app = document as XMLTest;
app.addEventListener("viewChanged", viewChangeHandler);
}
[38/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Fixed XML setAttribute()
Posted by cd...@apache.org.
Fixed XML setAttribute()
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/70a4892d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/70a4892d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/70a4892d
Branch: refs/heads/feature/maven-migration
Commit: 70a4892d60204ffe15d89056ad01333f6ff62497
Parents: 495d016
Author: Harbs <ha...@in-tools.com>
Authored: Tue Apr 12 08:47:25 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Tue Apr 12 08:47:25 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/70a4892d/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 7d47fca..d3ab421 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -1762,7 +1762,21 @@ package
{
//it's a regular attribute string
//TODO use toXMLName or toAttributeName to convert attr and assing it
-
+ var qname:QName = toAttributeName(attr);
+ var attrXML:XML = new XML();
+ attrXML.setNodeKind("attribute");
+ attrXML.setName(toAttributeName(attr));
+ attrXML.setValue(value);
+ for(i=0;i<_attributes.length;i++)
+ {
+ if(_attributes[i].name().equals(attrXML.name()))
+ {
+ _attributes[i].setValue(value);
+ return;
+ }
+ //addChild(_att)
+ }
+ addChild(attrXML);
}
}
[30/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- More XML
Posted by cd...@apache.org.
More XML
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9d44fa95
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9d44fa95
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9d44fa95
Branch: refs/heads/feature/maven-migration
Commit: 9d44fa95a1c4e6a2bd64492895f15ef0af195af4
Parents: d4bce99
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 11:24:36 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 11:24:36 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 28 +++++++++++---------
.../projects/XML/src/main/flex/XMLList.as | 2 +-
manualtests/XMLTest/src/MyInitialView.mxml | 7 +++--
3 files changed, 21 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d44fa95/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 288fa35..9b9c475 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -270,11 +270,11 @@ package
static public function defaultSettings():Object
{
return {
- "ignoreComments" : true,
- "ignoreProcessingInstructions" : true,
- "ignoreWhitespace" : true,
- "prettyIndent" : 2,
- "prettyPrinting" : true
+ ignoreComments : true,
+ ignoreProcessingInstructions : true,
+ ignoreWhitespace : true,
+ prettyIndent : 2,
+ prettyPrinting : true
}
}
@@ -306,11 +306,11 @@ package
static public function settings():Object
{
return {
- "ignoreComments" : ignoreComments,
- "ignoreProcessingInstructions" : ignoreProcessingInstructions,
- "ignoreWhitespace" : ignoreWhitespace,
- "prettyIndent" : prettyIndent,
- "prettyPrinting" : prettyPrinting
+ ignoreComments : ignoreComments,
+ ignoreProcessingInstructions : ignoreProcessingInstructions,
+ ignoreWhitespace : ignoreWhitespace,
+ prettyIndent : prettyIndent,
+ prettyPrinting : prettyPrinting
}
}
@@ -1672,8 +1672,8 @@ package
throw new TypeError("cannot assign parent xml as child");
v.setParent(this);
if(_children[idx])
- _children[idx].setParent(null);
- _children[idx] = v;
+ removeChild(_children[idx]);
+ insertChildAt(v,idx);
}
else if(v is XMLList)
{
@@ -1999,11 +1999,13 @@ package
COMPILE::JS
public function setParent(parent:XML):void
{
+ if(parent == _parent)
+ return;
var oldParent:XML = _parent;
_parent = parent;
//assign first to prevent the possiblity of a recursive loop
if(oldParent)
- _parent.removeChild(this);
+ oldParent.removeChild(this);
}
public function setValue(value:String):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d44fa95/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index 0f4b2ab..cb38a4b 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -557,7 +557,7 @@ package
var childToReplace:XML = _xmlArray[idx];
if(childToReplace && _targetObject)
{
- _targetObject.replaceChildAt(childToReplace.childIndex,child);
+ _targetObject.replaceChildAt(childToReplace.childIndex(),child);
}
if(child is XML)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d44fa95/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index 6451996..cf9f677 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -52,12 +52,15 @@ limitations under the License.
trace("baz: " + xml1.@baz.toString() + " //true");
var child:XML = <pop><child name="Sam"/></pop>;
xml1.appendChild(child);
- child = new XML('<pop><child name="George"/></pop>');
+ child = <pop><child name="George"/></pop>;
xml1.appendChild(child);
trace(xml1.pop[0].toString());
trace(xml1.pop[1].toString());
var pop:XMLList = xml1.pop;
- pop[pop.length()] = new XML('<pop><child name="Fred"/></pop>');
+ pop[pop.length()] = <pop><child name="Fred"/></pop>;
+ trace(pop.toString());
+ trace(xml1.toString());
+ pop[0] = <pop><child name="Fred"/></pop>;
trace(pop.toString());
trace(xml1.toString());
}
[48/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- updated XMLTest
Posted by cd...@apache.org.
updated XMLTest
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7c5a215a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7c5a215a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7c5a215a
Branch: refs/heads/feature/maven-migration
Commit: 7c5a215a7586291b0df2b4297806c44151402b23
Parents: 0981892
Author: Harbs <ha...@in-tools.com>
Authored: Thu Apr 14 00:13:14 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Apr 14 00:13:14 2016 +0300
----------------------------------------------------------------------
manualtests/XMLTest/src/MyInitialView.mxml | 54 ++++++++++++++++++++++++-
1 file changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7c5a215a/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index 83de865..a60578c 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -35,6 +35,7 @@ limitations under the License.
<![CDATA[
import XML;
+ import mx.collections.XMLListCollection;
private var xmlStr:String = '<?xml version="1.0" encoding="UTF-8" ?>'+
'<catalog xmlns:fx="http://ns.adobe.com/mxml/2009"'+
@@ -135,8 +136,8 @@ trace(prod.childIndex());
list4[1] = <a id="2"/>;
list4[2] = <a id="3"/>;
//JIRA https://issues.apache.org/jira/browse/FLEX-35072
-// list1 += list4
-list1.concat(list4);
+ list1 += list4
+//list1.concat(list4);
xml2.insertChildAfter(xml2.a,<a id="123"/>);
xml2.a = list4;
xml2.a = <a id="123"/>;
@@ -185,7 +186,56 @@ list1.concat(list4);
trace(list1.toXMLString());
trace(list1.toString());
trace("done");
+ trace("test 3");
+var xmlSource:XML =
+<xmlParentNode>
+ <Set1>
+ <child><year>2015</year></child>
+ <child><year>2016</year></child>
+ <child><year>2017</year></child>
+ </Set1>
+ <Set2>
+ <child><year>2015</year></child>
+ <child><year>2016</year></child>
+ <child><year>2017</year></child>
+ </Set2>
+</xmlParentNode>;
+
+//var xmllcSet1:XMLListCollection = new XMLListCollection();
+//var xmllcSet2:XMLListCollection = new XMLListCollection();
+
+//xmllcSet1.source = xmlSource.Set1.child;
+//xmllcSet2.source = xmlSource.Set2.child;
+
+var xmllcSet1:XMLList = xmlSource.Set1.child;
+var xmllcSet2:XMLList = xmlSource.Set2.child;
+
+trace(xmllcSet1.toXMLString());
+trace(xmllcSet2.toXMLString());
+
+
+//var xmllcFiltered: XMLListCollection = new XMLListCollection();
+
+//xmllcFiltered.source = xmlSource.Set1.child.(year == "2015");
+var xmllcFiltered:XMLList = xmlSource.Set1.child.(year == "2015");
+trace(xmllcFiltered.toXMLString());
+trace("test 4");
+var svg:XML = <svg>
+ <group>
+ <rect id="1" />
+ <rect id="2" />
+ </group>
+ <group>
+ <rect id="3" />
+ <rect id="4" />
+ </group>
+</svg>;
+
+var rects:XMLList = svg..rect;
+rects[1].@width = "100px";
+rects.(@id==3).@height = "100px";
+trace(rects.toXMLString());
}
]]>
</fx:Script>
[11/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- remove GCL crypt folder (and upgrade Selenium)
Posted by cd...@apache.org.
remove GCL crypt folder (and upgrade Selenium)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e85d9e13
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e85d9e13
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e85d9e13
Branch: refs/heads/feature/maven-migration
Commit: e85d9e134f2ae37acec5eb72a981550b4de58ed7
Parents: bfc904c
Author: Alex Harui <ah...@apache.org>
Authored: Thu Mar 31 19:30:31 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Mar 31 19:30:31 2016 -0700
----------------------------------------------------------------------
build.xml | 26 ++++++++++++++++----------
marmotinni/java/downloads.xml | 6 +++---
2 files changed, 19 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e85d9e13/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8047641..651468c 100644
--- a/build.xml
+++ b/build.xml
@@ -782,14 +782,20 @@
<target name="copy-gcl-from-goog-home" if="GOOG_HOME">
<echo message="Copying GCL from ${GOOG_HOME}"></echo>
<copy todir="${basedir}/temp/js/lib/google/closure-library">
- <fileset dir="${GOOG_HOME}" />
+ <fileset dir="${GOOG_HOME}" >
+ <include name="**"/>
+ <exclude name="closure/goog/crypt/**" />
+ </fileset>
</copy>
</target>
<target name="copy-gcl-from-downloaded" unless="GOOG_HOME">
<echo message="Copying GCL from ${basedir}/temp/js/lib/google/closure-library"></echo>
<copy todir="${basedir}/temp/js/lib/google/closure-library">
- <fileset dir="${basedir}/js/lib/google/closure-library" />
+ <fileset dir="${basedir}/js/lib/google/closure-library" >
+ <include name="**"/>
+ <exclude name="closure/goog/crypt/**" />
+ </fileset>
</copy>
</target>
@@ -1064,7 +1070,7 @@
<arg value="script=${basedir}/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml" />
<!--<arg value="showSteps=true" />-->
<classpath>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.48.2.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.53.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-2.0b4.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
@@ -1078,7 +1084,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.2.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.16.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-19.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.18.jar"/>
@@ -1090,7 +1096,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-compiler-jdt-5.5.15.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-runtime-5.5.15.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/javax.servlet-api-3.1.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.48.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-continuation-9.2.3.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-http-9.2.3.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-io-9.2.3.v20150730.jar"/>
@@ -1109,7 +1115,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.9.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-api-9.2.13.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-client-9.2.13.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-common-9.2.13.v20150730.jar"/>
@@ -1163,7 +1169,7 @@
<mkdir dir="${basedir}/mustella/java/bin"/>
<javac srcdir="${basedir}/mustella/java/src/marmotinni" destdir="${basedir}/mustella/java/bin" debug="off" optimize="on">
<classpath>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.48.2.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.53.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-2.0b4.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
@@ -1177,7 +1183,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.2.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.16.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-19.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.18.jar"/>
@@ -1189,7 +1195,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-compiler-jdt-5.5.15.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jasper-runtime-5.5.15.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/javax.servlet-api-3.1.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.48.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-continuation-9.2.3.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-http-9.2.3.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-io-9.2.3.v20150730.jar"/>
@@ -1208,7 +1214,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.9.9.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-api-9.2.13.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-client-9.2.13.v20150730.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/websocket-common-9.2.13.v20150730.jar"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e85d9e13/marmotinni/java/downloads.xml
----------------------------------------------------------------------
diff --git a/marmotinni/java/downloads.xml b/marmotinni/java/downloads.xml
index 14c0b15..c644c75 100644
--- a/marmotinni/java/downloads.xml
+++ b/marmotinni/java/downloads.xml
@@ -32,9 +32,9 @@
selenium (2.32.0) - Apache 2.0
-->
- <property name="selenium2.jar.dir.name" value="2.48"/>
- <property name="selenium2.jar.name" value="selenium-java-2.48.2"/>
- <property name="selenium2.dir.name" value="selenium-2.48.2"/>
+ <property name="selenium2.jar.dir.name" value="2.53"/>
+ <property name="selenium2.jar.name" value="selenium-java-2.53.0"/>
+ <property name="selenium2.dir.name" value="selenium-2.53.0"/>
<!--
Because the downloads requires a network connection and the JARs don't change very often,
[05/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- AntOnAIR doesn't have flattenmapper so try alternative
Posted by cd...@apache.org.
AntOnAIR doesn't have flattenmapper so try alternative
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/50ae7df9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/50ae7df9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/50ae7df9
Branch: refs/heads/feature/maven-migration
Commit: 50ae7df92601fb920f7b82249bea10070815c5f4
Parents: 7cd1bd4
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 09:01:16 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 09:01:16 2016 -0700
----------------------------------------------------------------------
installer.xml | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ae7df9/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 27ae65f..01d676e 100644
--- a/installer.xml
+++ b/installer.xml
@@ -704,27 +704,24 @@
description="Downloads Flat fonts and copies to correct locations">
<mkdir dir="${download.dir}"/>
- <echo>${INFO_INSTALLING_FLAT_FONTS} ${flat.font.url.server}/${flat.font.url.folder}/${flat.font.url.file}</echo>
+ <echo>${INFO_INSTALLING_FLAT_FONTS} https://github.com/designmodo/Flat-UI/archive/2.2.2.zip</echo>
<get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
dest="${download.dir}/flat-ui_2_2.zip"
verbose="false"/>
<mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
- <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
- <patternset>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"/>
- </patternset>
- <flattenmapper />
- </unzip>
- <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
- <patternset>
- <include name="Flat-UI-2.2.2/README.md"/>
- </patternset>
- <flattenmapper />
- </unzip>
+ <mkdir dir="${download.dir}/flat/fonts"/>
+ <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${download.dir}/flat/fonts" />
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/README.md"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
</target>
<!-- swfobject.js (Version 2.2) -->
[26/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Fixed QName toString()
Posted by cd...@apache.org.
Fixed QName toString()
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/62e69f50
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/62e69f50
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/62e69f50
Branch: refs/heads/feature/maven-migration
Commit: 62e69f50dde645d2ed614d7989916ca212bc471c
Parents: 40d5bf3
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 17:56:34 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 17:56:34 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/QName.as | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/62e69f50/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index c6886aa..70298f9 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -100,7 +100,8 @@ package
COMPILE::JS
public function toString():String
{
- return _localName;
+ var uriVal:String = _uri ? _uri : "*";
+ return uriVal + "::" + _localName;
}
COMPILE::JS
[47/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix up after changing FalconJX to no longer automatically generate release
build through GCC
Posted by cd...@apache.org.
fix up after changing FalconJX to no longer automatically generate release build through GCC
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0981892f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0981892f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0981892f
Branch: refs/heads/feature/maven-migration
Commit: 0981892f2957d30e741159be2623df20f42979a1
Parents: f3c785a
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 13 12:24:47 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 13 12:24:47 2016 -0700
----------------------------------------------------------------------
examples/build_example.xml | 6 ++---
.../FlexJS (FalconJX Debug Build).launch | 28 ++++++++++++++++++++
...JS (FalconJX Debug and Release Build).launch | 2 +-
3 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0981892f/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 44c88a7..15f3596 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -234,7 +234,7 @@
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="-debug" />
+ <arg value="-debug=false" />
<arg value="${theme_arg}" />
<arg value="-compiler.mxml.children-as-data" />
<arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
@@ -278,7 +278,7 @@
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
<arg value="+configname=air" />
- <arg value="-debug" />
+ <arg value="-debug=false" />
<arg value="${theme_arg}" />
<arg value="-compiler.mxml.children-as-data" />
<arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
@@ -321,7 +321,7 @@
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="-debug" />
+ <arg value="-debug=false" />
<arg value="${theme_arg}" />
<arg value="-define=CONFIG::as_only,false" />
<arg value="-define=CONFIG::js_only,true" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0981892f/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch b/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch
new file mode 100644
index 0000000..96f8cfc
--- /dev/null
+++ b/ide/flashbuilder/FlexJS (FalconJX Debug Build).launch
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<launchConfiguration type='org.eclipse.ui.externaltools.ProgramLaunchConfigurationType'>
+<booleanAttribute key='org.eclipse.debug.core.appendEnvironmentVariables' value='false'/>
+<listAttribute key='org.eclipse.debug.ui.favoriteGroups'>
+<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>
+</listAttribute>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$MXMLC'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-debug=true -fb "${project_loc}"'/>
+</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0981892f/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
----------------------------------------------------------------------
diff --git a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch b/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
index a3cab05..2da874d 100644
--- a/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
+++ b/ide/flashbuilder/FlexJS (FalconJX Debug and Release Build).launch
@@ -24,5 +24,5 @@
</listAttribute>
<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/>
<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='$FLEXJS_HOME/js/bin/$MXMLC'/>
-<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-fb "${project_loc}"'/>
+<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-debug=false -fb "${project_loc}"'/>
</launchConfiguration>
[42/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- strip down GCL to only the files we need
Posted by cd...@apache.org.
strip down GCL to only the files we need
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3f065a27
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3f065a27
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3f065a27
Branch: refs/heads/feature/maven-migration
Commit: 3f065a274a399801c36c49b82fc4f8b73c89f4bf
Parents: 667dd46
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 23:25:09 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
frameworks/build.xml | 1 +
frameworks/downloads.xml | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f065a27/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index c6c8a5e..ea42384 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -159,6 +159,7 @@
<exclude name="swfobject/index.template.html" />
<exclude name="swfobject/expressInstall.swf" />
<exclude name="swfobject/swfobject.js" />
+ <exclude name="swfobject/history/**" />
</delete>
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3f065a27/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 7fc12b1..0b3909a 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -75,6 +75,7 @@
<fileset dir="${FLEXJS_HOME}/templates/swfobject">
<include name="**/**"/>
<exclude name="index.template.html"/>
+ <exclude name="history/**"/>
</fileset>
</delete>
</target>
@@ -160,8 +161,45 @@
<unzip src="${download.dir}/google-closure-library-master.zip" dest="${FLEXJS_HOME}/js/lib/google/closure-library">
<cutdirsmapper dirs="1" />
</unzip>
+ <property name="GOOG_DIR" value="${FLEXJS_HOME}/js/lib/google/closure-library" />
+ <antcall target="subset-goog" />
</target>
+ <target name="subset-goog" >
+ <property name="GOOG_DIR" value="${GOOG_HOME}" />
+ <delete failonerror="false">
+ <!-- we only need base.js, eventtarget.js and their dependencies -->
+ <fileset dir="${GOOG_DIR}">
+ <include name="**"/>
+ <exclude name="closure/goog/array/array.js"/>
+ <exclude name="closure/goog/asserts/asserts.js"/>
+ <exclude name="closure/goog/base.js"/>
+ <exclude name="closure/goog/debug/entrypointregistry.js"/>
+ <exclude name="closure/goog/debug/error.js"/>
+ <exclude name="closure/goog/disposable/disposable.js"/>
+ <exclude name="closure/goog/disposable/idisposable.js"/>
+ <exclude name="closure/goog/dom/nodetype.js"/>
+ <exclude name="closure/goog/events/browserevent.js"/>
+ <exclude name="closure/goog/events/browserfeature.js"/>
+ <exclude name="closure/goog/events/event.js"/>
+ <exclude name="closure/goog/events/eventid.js"/>
+ <exclude name="closure/goog/events/events.js"/>
+ <exclude name="closure/goog/events/eventtarget.js"/>
+ <exclude name="closure/goog/events/eventtype.js"/>
+ <exclude name="closure/goog/events/listenable.js"/>
+ <exclude name="closure/goog/events/listener.js"/>
+ <exclude name="closure/goog/events/listenermap.js"/>
+ <exclude name="closure/goog/labs/useragent/browser.js"/>
+ <exclude name="closure/goog/labs/useragent/engine.js"/>
+ <exclude name="closure/goog/labs/useragent/platform.js"/>
+ <exclude name="closure/goog/labs/useragent/util.js"/>
+ <exclude name="closure/goog/object/object.js"/>
+ <exclude name="closure/goog/reflect/reflect.js"/>
+ <exclude name="closure/goog/string/string.js"/>
+ <exclude name="closure/goog/useragent/useragent.js"/>
+ </fileset>
+ </delete>
+ </target>
<target name="gcl-clean" description="Deletes Google Closure Library">
<echo message="Deleting Google Closure Library"/>
<delete dir="${FLEXJS_HOME}/js/lib" failonerror="false" />
[46/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix subsetter
Posted by cd...@apache.org.
fix subsetter
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f3c785a0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f3c785a0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f3c785a0
Branch: refs/heads/feature/maven-migration
Commit: f3c785a00e8187c1b2eae8f8f40adb1f587a4c5b
Parents: 66669cf
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 13 12:24:16 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 13 12:24:16 2016 -0700
----------------------------------------------------------------------
frameworks/downloads.xml | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f3c785a0/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 089fa16..e4f2cf7 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -22,6 +22,9 @@
<property name="FLEXJS_HOME" location="../.."/>
<!-- properties -->
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/local.properties"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${env.FLEX_HOME}" />
@@ -166,7 +169,13 @@
</target>
<target name="subset-goog" >
+ <condition property="GOOG_HOME" value="${env.GOOG_HOME}">
+ <not>
+ <isset property="GOOG_HOME"/>
+ </not>
+ </condition>
<property name="GOOG_DIR" value="${GOOG_HOME}" />
+ <echo>Subsetting ${GOOG_DIR}</echo>
<delete failonerror="false">
<!-- we only need base.js, eventtarget.js and their dependencies -->
<fileset dir="${GOOG_DIR}">
[40/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- typo
Posted by cd...@apache.org.
typo
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/923fc788
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/923fc788
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/923fc788
Branch: refs/heads/feature/maven-migration
Commit: 923fc7885507eedea3be05abf07d7743a3ad859c
Parents: 9ce42e2
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 13 00:27:07 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 13 00:27:07 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XMLList.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/923fc788/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index 8284bda..6b3e3d2 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -665,7 +665,7 @@ package
public function setChild(elementName:*, elements:Object):void
{
var len:int = _xmlArray.length;
- if(len == 0)
+ if(len == 1)
_xmlArray[0].setChild(elementName,elements);
}
[09/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- update rat in releasecandidate.xml
Posted by cd...@apache.org.
update rat in releasecandidate.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8009ec03
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8009ec03
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8009ec03
Branch: refs/heads/feature/maven-migration
Commit: 8009ec0344c590f3f4c60f099e89a8de8eb8ea27
Parents: 4c94b55
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 21:51:12 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 21:51:12 2016 -0700
----------------------------------------------------------------------
releasecandidate.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8009ec03/releasecandidate.xml
----------------------------------------------------------------------
diff --git a/releasecandidate.xml b/releasecandidate.xml
index a6e50fb..20f468f 100644
--- a/releasecandidate.xml
+++ b/releasecandidate.xml
@@ -49,9 +49,10 @@
</condition>
<property name="rat.report" value="${basedir}/rat-report.txt"/>
- <property name="apache.rat.jar" value="apache-rat-0.8.jar" />
- <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
- <property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
+ <property name="apache.rat.jar" value="apache-rat-0.11.jar" />
+ <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
+ <property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
+ <property name="apache.rat.tasks.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat-tasks/0.11" />
<property file="${basedir}/local.properties" />
<property file="${basedir}/build.properties" />
@@ -192,7 +193,7 @@
<get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" />
</target>
<target name="install-rat.tasks.jar" unless="apache.rat.tasks.found">
- <get src="${apache.rat.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
+ <get src="${apache.rat.tasks.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
</target>
<target name="rat-taskdef" description="Rat taskdef">
[08/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix issues with release packaging, installation and approval
Posted by cd...@apache.org.
fix issues with release packaging, installation and approval
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4c94b551
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4c94b551
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4c94b551
Branch: refs/heads/feature/maven-migration
Commit: 4c94b5519f00cdda6410ec62ef268d40cd1c0a01
Parents: fcb2372
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 17:39:13 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 17:39:13 2016 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 116 ++++++++++++++-
LICENSE.base | 203 +++++++++++++++++++++++++++
LICENSE.bin | 4 -
apache-flex-flexjs-installer-config.xml | 2 +-
build.xml | 12 +-
installer.xml | 18 ++-
6 files changed, 334 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 727d6c3..2c2a436 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -54,6 +54,7 @@
<property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
<property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
+ <property name="doc.rat.report" value="${basedir}/rat-report-doc.txt"/>
<property name="apache.rat.jar" value="apache-rat-0.11.jar" />
<property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
<property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
@@ -146,11 +147,19 @@
<isset property="rc" />
</not>
</condition>
+ <condition property="doc.package.url.path"
+ value="${package.url.path}">
+ <not>
+ <isset property="rc" />
+ </not>
+ </condition>
<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/flexjs/${release.version}/rc${rc}" />
<property name="package.url.name" value="apache-flex-flexjs-${release.version}-src" />
<property name="bin.package.url.path" value="${package.url.path}/binaries" />
<property name="bin.package.url.name" value="apache-flex-flexjs-${release.version}-bin" />
+ <property name="doc.package.url.path" value="${package.url.path}/doc" />
+ <property name="doc.package.url.name" value="apache-flex-flexjs-${release.version}-asdocs" />
<condition property="zip.package">
<equals arg1="zip" arg2="${package.suffix}" />
@@ -197,10 +206,10 @@
classpathref="anttask.classpath"/>
</target>
- <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,binary-rat,check-notices,build,approve" description="Perform required release approval steps">
+ <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,build,approve" description="Perform required release approval steps">
</target>
- <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,binary-rat,check-notices,build,approve" description="Perform required release approval steps">
+ <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,build,approve" description="Perform required release approval steps">
</target>
<target name="test" >
@@ -229,6 +238,10 @@
dest="${basedir}/${bin.package.url.name}.${package.suffix}" />
<get src="${bin.package.url.path}/${bin.package.url.name}.${package.suffix}.md5"
dest="${basedir}/${bin.package.url.name}.${package.suffix}.md5" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip"
+ dest="${basedir}/${doc.package.url.name}.zip" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip.md5"
+ dest="${basedir}/${doc.package.url.name}.zip.md5" />
<antcall target="get_asc" />
</target>
@@ -237,6 +250,8 @@
dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
<get src="${bin.package.url.path}/${bin.package.url.name}.${package.suffix}.asc"
dest="${basedir}/${bin.package.url.name}.${package.suffix}.asc" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip.asc"
+ dest="${basedir}/${doc.package.url.name}.zip.asc" />
</target>
<target name="check-sigs" description="check md5 and gpg sigs">
@@ -258,6 +273,15 @@
</not>
</condition>
<fail message="Binary Package MD5 checksum did not match" if="BinaryMD5Invalid" />
+ <replace file="${basedir}/${doc.package.url.name}.zip.md5"
+ token=" " />
+ <checksum file="${basedir}/${doc.package.url.name}.zip" algorithm="md5" verifyproperty="doc.md5.ok" />
+ <condition property="DocMD5Invalid">
+ <not>
+ <equals arg1="${doc.md5.ok}" arg2="true" />
+ </not>
+ </condition>
+ <fail message="Doc Package MD5 checksum did not match" if="DocMD5Invalid" />
<antcall target="gpg_check" />
</target>
@@ -272,6 +296,11 @@
<arg value="${basedir}/${bin.package.url.name}.${package.suffix}.asc" />
<arg value="${basedir}/${bin.package.url.name}.${package.suffix}" />
</exec>
+ <exec executable="gpg" failonerror="true">
+ <arg value="--verify" />
+ <arg value="${basedir}/${doc.package.url.name}.${package.suffix}.asc" />
+ <arg value="${basedir}/${doc.package.url.name}.${package.suffix}" />
+ </exec>
</target>
<target name="uncompress" depends="pre-clean, untar-file, unzip-file" />
@@ -279,6 +308,7 @@
<target name="pre-clean" description="remove old uncompressed package" >
<delete dir="${basedir}/${package.url.name}" failonerror="false" />
<delete dir="${basedir}/${bin.package.url.name}" failonerror="false" />
+ <delete dir="${basedir}/${doc.package.url.name}" failonerror="false" />
</target>
<target name="untar-file" unless="zip.package" description="Untars zipFile">
@@ -286,6 +316,8 @@
dest="${basedir}" compression="gzip"/>
<untar src="${basedir}/${bin.package.url.name}.${package.suffix}"
dest="${basedir}" compression="gzip"/>
+ <unzip src="${basedir}/${doc.package.url.name}.zip"
+ dest="${basedir}/${doc.package.url.name}"/>
</target>
<target name="unzip-file" if="zip.package" description="Unzips zipFile">
@@ -293,6 +325,8 @@
dest="${basedir}/${package.url.name}"/>
<unzip src="${basedir}/${bin.package.url.name}.${package.suffix}"
dest="${basedir}/${bin.package.url.name}"/>
+ <unzip src="${basedir}/${doc.package.url.name}.${package.suffix}"
+ dest="${basedir}/${doc.package.url.name}"/>
</target>
<target name="rat-check" >
@@ -315,6 +349,7 @@
<exclude name="frameworks/js/.jshintrc"/>
<!-- fragments -->
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
</fileset>
</rat:report>
<antcall target="display-text" >
@@ -357,6 +392,7 @@
<exclude name="frameworks/js/.jshintrc"/>
<!-- fragments -->
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
<!-- Google Closure Library -->
<exclude name="js/lib/google/**"/>
<!-- compiled output -->
@@ -423,6 +459,50 @@
addproperty="rat.bin.binaries.ok"/>
</target>
+ <target name="doc-rat" >
+ <echo message="Checking files at ${basedir}/${doc.package.url.name}, report is ${doc.rat.report}"/>
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${doc.rat.report}">
+ <fileset dir="${basedir}/${doc.package.url.name}">
+ <!-- exclude generated html -->
+ <exclude name="asdoc/index.html"/>
+ <exclude name="asdoc/index-*.html"/>
+ <exclude name="asdoc/google/maps/**/*.html"/>
+ <exclude name="asdoc/org/**/*.html"/>
+ <exclude name="asdoc/package*.html"/>
+ <exclude name="asdoc/all-classes.html"/>
+ <exclude name="asdoc/all-index*.html"/>
+ <exclude name="asdoc/class-*.html"/>
+ <exclude name="asdoc/title-bar.html"/>
+ <exclude name="asdoc/Namespace.html"/>
+ <exclude name="asdoc/QName.html"/>
+ <!-- exclude log -->
+ <exclude name="asdoc/validation_errors.log"/>
+ </fileset>
+ </rat:report>
+
+ <antcall target="display-text" >
+ <param name="file" value="${doc.rat.report}" />
+ </antcall>
+ <input
+ message="Check that there are no unknown or unapproved licenses or archives. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="rat.doc.license.ok"/>
+ <echo>filtering out AL files to make it easier to see binary files</echo>
+ <copy file="${doc.rat.report}" tofile="${doc.rat.report}.bin.txt" />
+ <replaceregexp file="${doc.rat.report}.bin.txt" match="..AL.*" replace="__AL" byline="true"/>
+ <replaceregexp file="${doc.rat.report}.bin.txt" flags="gs" match="__AL." replace="" byline="false"/>
+ <antcall target="display-text" >
+ <param name="file" value="${doc.rat.report}.bin.txt" />
+ </antcall>
+ <input
+ message="Check that there are no unexpected binaries. Is it ok?"
+ validargs="y,n"
+ defaultvalue="n"
+ addproperty="rat.doc.binaries.ok"/>
+ </target>
+
<target name="check-notices" description="open each notice file for review, grep for a few things" >
<fail message="README not in package">
<condition>
@@ -487,6 +567,7 @@
validargs="y,n"
defaultvalue="y"
addproperty="license.ok"/>
+
<antcall target="display-text" >
<param name="file" value="${basedir}/${bin.package.url.name}/NOTICE" />
</antcall>
@@ -504,6 +585,24 @@
validargs="y,n"
defaultvalue="y"
addproperty="bin.license.ok"/>
+
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/${doc.package.url.name}/asdoc/NOTICE" />
+ </antcall>
+ <input
+ message="Check the doc package NOTICE for required notices from third-parties. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="doc.notice.ok"/>
+
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/${doc.package.url.name}/asdoc/LICENSE" />
+ </antcall>
+ <input
+ message="Check the doc package LICENSE for the Apache License and third-party licenses. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="doc.license.ok"/>
</target>
<target name="ask.build">
@@ -678,12 +777,16 @@
<equals arg1="${rat.binaries.ok}" arg2="y" />
<equals arg1="${rat.bin.license.ok}" arg2="y" />
<equals arg1="${rat.bin.binaries.ok}" arg2="y" />
+ <equals arg1="${rat.doc.license.ok}" arg2="y" />
+ <equals arg1="${rat.doc.binaries.ok}" arg2="y" />
<equals arg1="${readme.ok}" arg2="y" />
<equals arg1="${releasenotes.ok}" arg2="y" />
<equals arg1="${notice.ok}" arg2="y" />
<equals arg1="${license.ok}" arg2="y" />
<equals arg1="${bin.notice.ok}" arg2="y" />
<equals arg1="${bin.license.ok}" arg2="y" />
+ <equals arg1="${doc.notice.ok}" arg2="y" />
+ <equals arg1="${doc.license.ok}" arg2="y" />
</and>
</condition>
<property name="vote" value="-1" />
@@ -707,7 +810,14 @@ NOTICE is ok: ${bin.notice.ok}
LICENSE is ok: ${bin.license.ok}
No unapproved licenses or archives in binary package: ${rat.bin.license.ok}
No unapproved binaries in binary package: ${rat.bin.binaries.ok}
- </echo>
+
+Package ${doc.package.url.path}/${doc.package.url.name}.zip
+Doc kit signatures match: y
+NOTICE is ok: ${doc.notice.ok}
+LICENSE is ok: ${doc.license.ok}
+No unapproved licenses or archives in doc package: ${rat.doc.license.ok}
+No unapproved binaries in doc package: ${rat.doc.binaries.ok}
+ </echo>
<fail>
<condition>
<equals arg1="-1" arg2="${vote}"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/LICENSE.base
----------------------------------------------------------------------
diff --git a/LICENSE.base b/LICENSE.base
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/LICENSE.base
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 2c5e7a2..6ffda73 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -2,10 +2,6 @@ Below are the licenses for components included in the binary distribution.
------------------------------------------------------------------------------------------
-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/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 7807a0c..42813bf 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -239,7 +239,7 @@
<license>Adobe Flex SDK 授權合約</license>
</zh_TW>
</component>
- <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="true" property="do.flat.install">
+ <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="false" property="do.flat.install">
<el_GR>
<label>designmodo fonts (Προαιρετικό)</label>
<message>Για το designmodo fonts ισχύει η συμφωνία χρήσης του CC-BY-NC-ND License. Θέλετε να εγκαταστήσετε το designmodo fonts;</message>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9bda287..8047641 100644
--- a/build.xml
+++ b/build.xml
@@ -531,6 +531,7 @@
<include name="RELEASE_NOTES"/>
<include name="LICENSE"/>
<include name="LICENSE.bin"/>
+ <include name="LICENSE.base"/>
<include name="NOTICE"/>
</fileset>
</copy>
@@ -742,7 +743,7 @@
<!-- fonts
<copy todir="${basedir}/temp/frameworks/fonts">
<fileset dir="${basedir}/frameworks/fonts" >
- <include name="**/**"/>
+ <include name="**/*.swf"/>
</fileset>
</copy>
-->
@@ -1006,12 +1007,8 @@
<copy todir="${basedir}/temp/asdoc">
<fileset dir="${basedir}/asdoc-output"/>
</copy>
- <copy todir="${basedir}/temp/asdoc">
- <fileset dir="${basedir}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- </fileset>
- </copy>
+ <copy todir="${basedir}/temp/asdoc" file="${basedir}/NOTICE" />
+ <copy tofile="${basedir}/temp/asdoc/LICENSE" file="${basedir}/LICENSE.base" />
<zip file="${basedir}/out/${kit.prefix}-asdocs.zip" basedir="${basedir}/temp"/>
<antcall target="clean-temp"/>
</target>
@@ -1378,6 +1375,7 @@
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
<fileset dir="${rat.dir}">
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
<!-- Start of binary files -->
<!-- exclude media (png, gif, jpg, mp3, flv) -->
<exclude name="**/*.png"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index f0806d1..50b213b 100644
--- a/installer.xml
+++ b/installer.xml
@@ -692,6 +692,8 @@
<!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
<target name="flat-check" description="Checks if Flat fonts has been downloaded.">
+ <!-- make this folder anyway so example scripts don't fail -->
+ <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
<available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff" property="skip.flat.install"/>
<condition property="skip.flat.install" value="true">
<not>
@@ -709,19 +711,23 @@
dest="${download.dir}/flat-ui_2_2.zip"
verbose="false"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
<mkdir dir="${download.dir}/flat/fonts"/>
<unzip src="${download.dir}/flat-ui_2_2.zip" dest="${download.dir}/flat/fonts" />
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.eot"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.svg"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/README.md"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/README.md"/>
+
+ <get src="http://apacheflexbuild.cloudapp.net:8080/job/flat-ui-icons-regular.swf/lastSuccessfulBuild/artifact/frameworks/fonts/flat-ui-icons-regular.swf"
+ dest="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.swf"
+ verbose="false"/>
+
</target>
<!-- swfobject.js (Version 2.2) -->
[20/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- skip extern swc for now
Posted by cd...@apache.org.
skip extern swc for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/75bbdd3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/75bbdd3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/75bbdd3a
Branch: refs/heads/feature/maven-migration
Commit: 75bbdd3a340bbe23b6a4ccb1db5d605b35403b4e
Parents: e2c462a
Author: Alex Harui <ah...@apache.org>
Authored: Sat Apr 9 22:57:08 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Apr 9 22:57:08 2016 -0700
----------------------------------------------------------------------
frameworks/projects/XML/build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/75bbdd3a/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index 6251bd9..7db690a 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -37,7 +37,9 @@
</path>
</target>
- <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of XML.swc">
+ <!--<target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of XML.swc">
+ </target>-->
+ <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,copy-js,compile,test-js" description="Full build of XML.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -153,7 +155,7 @@
<load-config filename="src/main/resources/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
+ <arg value="-external-library-path=${JS.SWC}" />
<!-- this is not on external-library path otherwise goog.requires are not generated -->
<arg value="-library-path+=${GCL.SWC}" />
<arg value="-define=COMPILE::AS3,false" />
[39/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Added setAttribute() and setChild() to XMLList
Posted by cd...@apache.org.
Added setAttribute() and setChild() to XMLList
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9ce42e25
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9ce42e25
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9ce42e25
Branch: refs/heads/feature/maven-migration
Commit: 9ce42e25f38809d52c6c26691056983e36d5b447
Parents: 70a4892
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 13 00:26:02 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 13 00:26:02 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XMLList.as | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9ce42e25/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index 1173512..8284bda 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -651,6 +651,24 @@ package
return _targetProperty;
}
+ COMPILE::JS
+ public function setAttribute(attr:*,value:String):void
+ {
+ var len:int = _xmlArray.length;
+ for (var i:int=0;i<len;i++)
+ _xmlArray[i].setAttribute(attr,value);
+
+ }
+
+
+ COMPILE::JS
+ public function setChild(elementName:*, elements:Object):void
+ {
+ var len:int = _xmlArray.length;
+ if(len == 0)
+ _xmlArray[0].setChild(elementName,elements);
+
+ }
/**
* Calls the text() method of each XML object and returns an XMLList object that contains the results.
*
[24/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Tweaked the test a bit to have nicer output
Posted by cd...@apache.org.
Tweaked the test a bit to have nicer output
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90c70cea
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90c70cea
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90c70cea
Branch: refs/heads/feature/maven-migration
Commit: 90c70cea45047fd630a0bd7d916c75ef94dc230e
Parents: 5d2d0dd
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 16:03:46 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 16:03:46 2016 +0300
----------------------------------------------------------------------
manualtests/XMLTest/src/MyInitialView.mxml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90c70cea/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index 8d2fff5..e57a0fc 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -47,8 +47,9 @@ limitations under the License.
var m:int;
var xml1:XML = <foo baz="true"/>;
trace(xml1.toXMLString());
+ trace(xml1.toXMLString() == '<foo baz="true"/>');
var baz:XMLList = xml1.@baz;
- trace(xml1.@baz.toString());
+ trace("baz: " + xml1.@baz.toString() + " //true");
}
]]>
[07/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- missing brace
Posted by cd...@apache.org.
missing brace
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fcb23726
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fcb23726
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fcb23726
Branch: refs/heads/feature/maven-migration
Commit: fcb237268ac28f60f49e62bef6f8681d9539c63d
Parents: c7756da
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 10:08:18 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 10:08:18 2016 -0700
----------------------------------------------------------------------
installer.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fcb23726/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 01d676e..f0806d1 100644
--- a/installer.xml
+++ b/installer.xml
@@ -713,15 +713,15 @@
<mkdir dir="${download.dir}/flat/fonts"/>
<unzip src="${download.dir}/flat-ui_2_2.zip" dest="${download.dir}/flat/fonts" />
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"
- todir="${FLEXJS_HOME/frameworks/fonts"/>
+ todir="${FLEXJS_HOME}/frameworks/fonts"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"
- todir="${FLEXJS_HOME/frameworks/fonts"/>
+ todir="${FLEXJS_HOME}/frameworks/fonts"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"
- todir="${FLEXJS_HOME/frameworks/fonts"/>
+ todir="${FLEXJS_HOME}/frameworks/fonts"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"
- todir="${FLEXJS_HOME/frameworks/fonts"/>
+ todir="${FLEXJS_HOME}/frameworks/fonts"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/README.md"
- todir="${FLEXJS_HOME/frameworks/fonts"/>
+ todir="${FLEXJS_HOME}/frameworks/fonts"/>
</target>
<!-- swfobject.js (Version 2.2) -->
[06/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- don't exclude this anymore
Posted by cd...@apache.org.
don't exclude this anymore
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c7756da7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c7756da7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c7756da7
Branch: refs/heads/feature/maven-migration
Commit: c7756da71acf51f8edc0da0fb466621a1d23d79f
Parents: 50ae7df
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 10:08:03 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 10:08:03 2016 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c7756da7/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index f6dccd1..727d6c3 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -361,8 +361,6 @@
<exclude name="js/lib/google/**"/>
<!-- compiled output -->
<exclude name="frameworks/projects/*/target/**"/>
- <!-- fonts -->
- <exclude name="frameworks/fonts/**"/>
<!-- swcs -->
<exclude name="frameworks/libs/Binding.swc"/>
<exclude name="frameworks/libs/Charts.swc"/>
[03/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- try to make the designmodo fonts an optional dependency
Posted by cd...@apache.org.
try to make the designmodo fonts an optional dependency
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fb682e0b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fb682e0b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fb682e0b
Branch: refs/heads/feature/maven-migration
Commit: fb682e0bc4053a9b5b0cf851dbf30da8e2c6cb93
Parents: 164ec03
Author: Alex Harui <ah...@apache.org>
Authored: Mon Mar 28 23:40:57 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Mar 28 23:40:57 2016 -0700
----------------------------------------------------------------------
apache-flex-flexjs-installer-config.xml | 29 ++++++++++
build.xml | 3 +-
frameworks/downloads.xml | 41 ++++++++++++--
installer.properties/en_US.properties | 14 +++++
installer.xml | 81 +++++++++++++++++++++++++---
5 files changed, 155 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 38264fd..7807a0c 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -152,6 +152,12 @@
<zh_CN>Adobe Flash Player playerglobal.swc (必须的)</zh_CN>
<zh_TW>Adobe Flash Player playerglobal.swc (必須的)</zh_TW>
</step>
+ <step id="flat-download" property="do.flat.install">
+ <el_GR>DesignModo fonts</el_GR>
+ <en_US>DesignModo fonts (Optional)</en_US>
+ <zh_CN>DesignModo fonts (必须的)</zh_CN>
+ <zh_TW>DesignModo fonts (必須的)</zh_TW>
+ </step>
<step id="swfobject-download">
<el_GR>SWFObject (Απαιτούμενο)</el_GR>
<en_US>SWFObject (Required)</en_US>
@@ -233,4 +239,27 @@
<license>Adobe Flex SDK 授權合約</license>
</zh_TW>
</component>
+ <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="true" property="do.flat.install">
+ <el_GR>
+ <label>designmodo fonts (Προαιρετικό)</label>
+ <message>Για το designmodo fonts ισχύει η συμφωνία χρήσης του CC-BY-NC-ND License. Θέλετε να εγκαταστήσετε το designmodo fonts;</message>
+ <license>'Αδεια χρήσης CC-BY-NC-ND</license>
+ </el_GR>
+ <en_US>
+ <label>designmodo fonts (Optional)</label>
+ <message>The CC-BY-NC-ND license applies to the designmodo fonts. Do you want to install the designmodo fonts?</message>
+ <license>CC-BY-NC-ND</license>
+ <licenseURL>http://creativecommons.org/licenses/by-nc-nd/3.0/</licenseURL>
+ </en_US>
+ <zh_CN>
+ <label>designmodo (必须的)</label>
+ <message>CC-BY-NC-ND 许可协议适用于 designmodo 的 fonts 文件. 您想要安装 designmodo 的 fonts 文件吗?</message>
+ <license>C-BY-NC-ND 许可协议</license>
+ </zh_CN>
+ <zh_TW>
+ <label>designmodo fonts(必須的)</label>
+ <message>CC-BY-NC-ND 授權合約適用於 designmodo 的 fonts 檔案. 您想要安裝 designmodo 的 fonts 檔案嗎?</message>
+ <license>CC-BY-NC-ND 授權合約</license>
+ </zh_TW>
+ </component>
</config>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6ec2fbc..9bda287 100644
--- a/build.xml
+++ b/build.xml
@@ -739,12 +739,13 @@
</copy>
-->
- <!-- fonts -->
+ <!-- fonts
<copy todir="${basedir}/temp/frameworks/fonts">
<fileset dir="${basedir}/frameworks/fonts" >
<include name="**/**"/>
</fileset>
</copy>
+ -->
<!-- examples -->
<copy todir="${basedir}/temp/examples">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index a54782d..ac9e0fb 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -26,8 +26,8 @@
<property name="FLEX_HOME" value="${env.FLEX_HOME}" />
<property name="download.dir" value="${FLEXJS_HOME}/in"/>
-
- <!--
+
+ <!--
To clean these you must call thirdparty-clean or super-clean to clean everything.
clean does not remove these since they don't change often and the downloads take time.
-->
@@ -82,11 +82,42 @@
<!-- swfobject.js (Version 2.2) -->
<!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
<target name="flat-ui-check" description="Checks if SWFObject has been downloaded.">
- <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat-ui.present"/>
+ <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat.donot.ask"/>
+ <condition property="flat.donot.ask">
+ <isset property="build.noprompt"/>
+ </condition>
+ <condition property="do.flat.install">
+ <isset property="build.noprompt"/>
+ </condition>
</target>
- <target name="flat-ui-download" depends="flat-ui-check" unless="flat-ui.present"
- description="Copies FlatUI from github">
+ <target name="ask-flat" unless="flat.donot.ask"
+ description="Prompt the user before downloading Flat fonts">
+
+ <property name="flat.prompt.text"
+ value="Apache FlexJS includes an optional component set that
+ ${line.separator}uses fonts from designmodo.com.
+ ${line.separator}The font files are subject to and governed by the
+ ${line.separator}Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported license:
+ ${line.separator}http://creativecommons.org/licenses/by-nc-nd/3.0/
+ ${line.separator}This license is not compatible with the Apache v2 license.
+ ${line.separator}Do you want to install the designmodo fonts?"/>
+ <input
+ message="${flat.prompt.text}"
+ validargs="y,n"
+ defaultvalue="n"
+ addproperty="input.flat.download"/>
+ <condition property="do.flat.install">
+ <equals arg1="y" arg2="${input.flat.download}"/>
+ </condition>
+ <!-- Only ask once per ant run. -->
+ <property name="flat.donot.ask" value="set"/>
+ </target>
+
+ <target name="flat-ui-download" depends="flat-ui-check,get-flat-fonts"
+ description="Copies FlatUI from github" />
+
+ <target name="get-flat-fonts" depends="ask-flat" if="do.flat.install" >
<mkdir dir="${download.dir}"/>
<get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index df50962..bb84b36 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -22,6 +22,19 @@ yes.no.prompts=y,n
yes=y
no=n
+flat.prompt.text=\
+Apache FlexJS includes an optional component set that\n\
+uses fonts from designmodo.com\n\
+\n\
+The font files are subject to and governed by the\n\
+Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported license:\n\
+http://creativecommons.org/licenses/by-nc-nd/3.0/\n\
+By downloading, modifying, distributing, using and/or accessing any of these font files\n\
+you agree to the terms and conditions of the applicable license agreement.\n\
+\n\
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the designmodo fonts?
+
flash.prompt.text=\
Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
\n\
@@ -75,6 +88,7 @@ INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Downloading Adobe AIR Runtime Kit for W
INFO_FINISHED_UNTARING=Finished untaring:
INFO_FINISHED_UNZIPPING=Finished uncompressing:
INFO_UNZIPPING=Uncompressing:
+INFO_INSTALLING_FLAT_FONTS=Installing DesignModo fonts from:
INFO_INSTALLING_PLAYERGLOBAL_SWC=Installing Adobe Flash Player playerglobal.swc from:
INFO_INSTALLING_CONFIG_FILES=Installing frameworks configuration files configured for use with an IDE
INFO_INSTALLING_LAUNCH_CONFIG_FILES=Installing Adobe Flash Builder launch configuration files
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index f026b9f..27ae65f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -59,7 +59,7 @@
<property name="flash.sdk.version" value="14.0"/>
<property name="flexjs.version" value="0.6.0"/>
<property name="falcon.version" value="0.6.0"/>
-
+
<property name="swfobject.url.server" value="https://github.com" />
<property name="swfobject.url.folder" value="swfobject/swfobject/archive" />
<property name="swfobject.url.file" value="2.2.zip" />
@@ -94,6 +94,9 @@
<condition property="flash.donot.ask" value="true">
<isset property="installer" />
</condition>
+ <condition property="flat.donot.ask" value="true">
+ <isset property="installer" />
+ </condition>
<condition property="COMPC" value="compc.bat">
<os family="windows" />
@@ -277,7 +280,7 @@
</fail>
</target>
- <target name="ask-licenses" depends="ask-air,ask-flash" description="Ask about the various licenses">
+ <target name="ask-licenses" depends="ask-air,ask-flash,ask-flat" description="Ask about the various licenses">
</target>
<target name="ask-air" unless="air.donot.ask"
@@ -291,6 +294,7 @@
<condition property="do.air.install">
<equals arg1="${yes}" arg2="${input.air.download}"/>
</condition>
+ <fail message="${ERROR_REQUIRED_LICENSE}" unless="do.air.install" />
<!-- Only ask once per ant run. -->
<property name="air.donot.ask" value="set"/>
</target>
@@ -306,10 +310,26 @@
<condition property="do.flash.install">
<equals arg1="${yes}" arg2="${input.flash.download}"/>
</condition>
+ <fail message="${ERROR_REQUIRED_LICENSE}" unless="do.flash.install" />
<!-- Only ask once per ant run. -->
<property name="flash.donot.ask" value="set"/>
</target>
+ <target name="ask-flat" unless="flat.donot.ask"
+ description="Prompt the user before downloading Flat fonts">
+
+ <input
+ message="${flat.prompt.text}"
+ validargs="${yes.no.prompts}"
+ defaultvalue="${no}"
+ addproperty="input.flat.download"/>
+ <condition property="do.flat.install">
+ <equals arg1="${yes}" arg2="${input.flat.download}"/>
+ </condition>
+ <!-- Only ask once per ant run. -->
+ <property name="flat.donot.ask" value="set"/>
+ </target>
+
<target name="mac-chmod" description="makes some scripts executable" unless="isWindows">
<exec executable="chmod" dir="${FLEXJS_HOME}">
<arg value="+x" />
@@ -412,13 +432,18 @@
<property name="skipCache" value="true" />
</target>
- <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download" />
+ <target name="get-third-party-files" depends="air-download,flash-download,flat-download,swfobject-download" />
<target name="air-check" description="Checks if AIR SDK has been downloaded.">
- <available file="${FLEXJS_HOME}/lib/adt.jar" property="air.jar.present"/>
+ <available file="${FLEXJS_HOME}/lib/adt.jar" property="skip.air.install"/>
+ <condition property="skip.air.install" value="true">
+ <not>
+ <isset property="do.air.install" />
+ </not>
+ </condition>
</target>
- <target name="air-download" depends="air-check" unless="air.jar.present"
+ <target name="air-download" depends="air-check" unless="skip.air.install"
description="Downloads AIR SDK and copies to correct locations">
<mkdir dir="${download.dir}"/>
@@ -632,10 +657,15 @@
<!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
<target name="flash-check" description="Checks if Flash SDK has been downloaded.">
- <available file="${FLEXJS_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="flash.swc.present"/>
+ <available file="${FLEXJS_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="skip.flash.install"/>
+ <condition property="skip.flash.install" value="true">
+ <not>
+ <isset property="do.flash.install" />
+ </not>
+ </condition>
</target>
- <target name="flash-download" depends="flash-check" unless="flash.swc.present"
+ <target name="flash-download" depends="flash-check" unless="skip.flash.install"
description="Downloads playerglobal.swc and copies to correct locations">
<mkdir dir="${download.dir}"/>
@@ -660,6 +690,43 @@
</antcall>
</target>
+ <!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
+ <target name="flat-check" description="Checks if Flat fonts has been downloaded.">
+ <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff" property="skip.flat.install"/>
+ <condition property="skip.flat.install" value="true">
+ <not>
+ <isset property="do.flat.install" />
+ </not>
+ </condition>
+ </target>
+
+ <target name="flat-download" depends="flat-check" unless="skip.flat.install"
+ description="Downloads Flat fonts and copies to correct locations">
+
+ <mkdir dir="${download.dir}"/>
+ <echo>${INFO_INSTALLING_FLAT_FONTS} ${flat.font.url.server}/${flat.font.url.folder}/${flat.font.url.file}</echo>
+ <get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
+ dest="${download.dir}/flat-ui_2_2.zip"
+ verbose="false"/>
+
+ <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
+ <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
+ <patternset>
+ <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"/>
+ <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"/>
+ <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"/>
+ <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"/>
+ </patternset>
+ <flattenmapper />
+ </unzip>
+ <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
+ <patternset>
+ <include name="Flat-UI-2.2.2/README.md"/>
+ </patternset>
+ <flattenmapper />
+ </unzip>
+ </target>
+
<!-- swfobject.js (Version 2.2) -->
<!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
<target name="swfobject-check" description="Checks if SWFObject has been downloaded.">
[34/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- added elementNames() to XMLList
Posted by cd...@apache.org.
added elementNames() to XMLList
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fdbc359e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fdbc359e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fdbc359e
Branch: refs/heads/feature/maven-migration
Commit: fdbc359ec0cb311bb5241834984e68489eadbdaa
Parents: fd1ae8e
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 20:18:56 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 20:18:56 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XMLList.as | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fdbc359e/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index ea7b4ec..1173512 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -255,7 +255,8 @@ package
while(i<len)
appendChild(list[i++]);
-// for each(item in list)
+// var xmlList:XMLList = list;
+// for each(item in xmlList)
// appendChild(item);
return this;
@@ -341,6 +342,17 @@ package
}
COMPILE::JS
+ public function elementNames():Array
+ {
+ var retVal:Array = [];
+ var i:int=0;
+ var len:int = _xmlArray.length;
+ while(i<len)
+ retVal.push(i++);
+ return retVal;
+ }
+
+ COMPILE::JS
public function equals(list:*):Boolean
{
/*
[44/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- eliminate duplicate download
Posted by cd...@apache.org.
eliminate duplicate download
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/667dd46a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/667dd46a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/667dd46a
Branch: refs/heads/feature/maven-migration
Commit: 667dd46ae564a3f4ba2fe53e56d2524c07a6ee1f
Parents: 7e660ea
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 12 22:20:47 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 12 23:47:06 2016 -0700
----------------------------------------------------------------------
build.xml | 2 ++
frameworks/build.xml | 4 +++-
frameworks/downloads.xml | 7 +++----
3 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 43e0a6a..941b75d 100644
--- a/build.xml
+++ b/build.xml
@@ -179,6 +179,8 @@
<!-- <ant dir="${basedir}/frameworks/js" target="thirdparty-downloads"/> -->
<!-- don't ask again about these since we just did if these weren't already set -->
<property name="build.noprompt" value="set" />
+ <!-- this flag is used by frameworks/build.xml to prevent a second download -->
+ <property name="no.thirdparty-downloads" value="set" />
</target>
<target name="prebuild" depends="check-compile-env,thirdparty-downloads,create-description,create-config"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 8d7b174..c6c8a5e 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -157,7 +157,9 @@
<!-- Delete only if it exists and it is empty. air and swfobject put dirs here. -->
<delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false">
<exclude name="swfobject/index.template.html" />
- </delete>
+ <exclude name="swfobject/expressInstall.swf" />
+ <exclude name="swfobject/swfobject.js" />
+ </delete>
</target>
<target name="Binding" description="Clean build of Binding.swc">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/667dd46a/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index ac9e0fb..7fc12b1 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -79,9 +79,9 @@
</delete>
</target>
- <!-- swfobject.js (Version 2.2) -->
- <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
- <target name="flat-ui-check" description="Checks if SWFObject has been downloaded.">
+ <!-- flat ui fonts -->
+ <!-- Because this requires a network connection it downloads Flat UI fonts only if it doesn't already exist. -->
+ <target name="flat-ui-check" description="Checks if Flat UI fonts have been downloaded.">
<available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat.donot.ask"/>
<condition property="flat.donot.ask">
<isset property="build.noprompt"/>
@@ -118,7 +118,6 @@
description="Copies FlatUI from github" />
<target name="get-flat-fonts" depends="ask-flat" if="do.flat.install" >
-
<mkdir dir="${download.dir}"/>
<get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
dest="${download.dir}/flat-ui_2_2.zip"
[13/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- try to fix 'all' target
Posted by cd...@apache.org.
try to fix 'all' target
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/781d38eb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/781d38eb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/781d38eb
Branch: refs/heads/feature/maven-migration
Commit: 781d38ebcc7c6e4f2c71ffddb39e61061d504c6f
Parents: 894b526
Author: Alex Harui <ah...@apache.org>
Authored: Sat Apr 2 21:41:32 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Apr 2 21:41:47 2016 -0700
----------------------------------------------------------------------
build.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/781d38eb/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 651468c..89d5e5c 100644
--- a/build.xml
+++ b/build.xml
@@ -1706,9 +1706,8 @@
/>
<ant dir="${base.folder.name}/flex-sdk" />
<property name="javadoc.zip.uptodate" value="set" /> <!-- javadoc fails on windows? -->
- <ant dir="${base.folder.name}/flex-falcon/compiler" />
- <ant dir="${base.folder.name}/flex-falcon/compiler.jx" />
- <ant dir="${base.folder.name}/flex-flexunit" />
+ <ant dir="${base.folder.name}/flex-falcon" target="all" />
+ <ant dir="${base.folder.name}/flex-flexunit" inheritAll="false" />
</target>
<target name="all" depends="set.base.folder, download-all, main" />
[25/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Worked around FLEX-35067 Fixed typo
Posted by cd...@apache.org.
Worked around FLEX-35067
Fixed typo
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/40d5bf39
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/40d5bf39
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/40d5bf39
Branch: refs/heads/feature/maven-migration
Commit: 40d5bf39e520389765de3f4d7bff21bf0540bc0b
Parents: 90c70ce
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 17:38:57 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 17:38:57 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/40d5bf39/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index b2222b6..93ba2b1 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -265,11 +265,11 @@ package
static public function defaultSettings():Object
{
return {
- ignoreComments : true,
- ignoreProcessingInstructions : true,
- ignoreWhitespace : true,
- prettyIndent : 2,
- prettyPrinting : true
+ "ignoreComments" : true,
+ "ignoreProcessingInstructions" : true,
+ "ignoreWhitespace" : true,
+ "prettyIndent" : 2,
+ "prettyPrinting" : true
}
}
@@ -301,11 +301,11 @@ package
static public function settings():Object
{
return {
- ignoreComments : ignoreComments,
- ignoreProcessingInstructions : ignoreProcessingInstructions,
- ignoreWhitespace : ignoreWhitespace,
- prettyIndent : prettyIndent,
- prettyPrinting : prettyPrinting
+ "ignoreComments" : ignoreComments,
+ "ignoreProcessingInstructions" : ignoreProcessingInstructions,
+ "ignoreWhitespace" : ignoreWhitespace,
+ "prettyIndent" : prettyIndent,
+ "prettyPrinting" : prettyPrinting
}
}
@@ -711,7 +711,7 @@ package
xml.setNodeKind(_nodeKind);
xml.setName(name());
xml.setValue(_value);
- for(i-0;i<_namespaces.length;i++)
+ for(i=0;i<_namespaces.length;i++)
{
xml.addNamespace(new Namespace(_namespaces[i]));
}
[18/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Application was not adding its own beads to its strand.
Posted by cd...@apache.org.
Application was not adding its own beads to its strand.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/64c699d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/64c699d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/64c699d3
Branch: refs/heads/feature/maven-migration
Commit: 64c699d376812a9a42a6450d69032886623385e5
Parents: fd130d7
Author: Peter Ent <pe...@apache.org>
Authored: Thu Apr 7 14:33:29 2016 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Thu Apr 7 14:33:29 2016 -0400
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/core/Application.as | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/64c699d3/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
index ac80b8c..7b00170 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as
@@ -578,8 +578,11 @@ package org.apache.flex.core
dispatchEvent('initialize');
- if (model is IBead) addBead(model as IBead);
- if (controller is IBead) addBead(controller as IBead);
+ for (var index:int in beads) {
+ addBead(beads[index]);
+ }
+
+ dispatchEvent(new org.apache.flex.events.Event("beadsAdded"));
initialView.applicationModel = model;
addElement(initialView);
[21/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- change how compile flags are used so it builds successfully
Posted by cd...@apache.org.
change how compile flags are used so it builds successfully
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a5ea916d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a5ea916d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a5ea916d
Branch: refs/heads/feature/maven-migration
Commit: a5ea916d77840080e69510a092ac88bc2e670420
Parents: 75bbdd3
Author: Alex Harui <ah...@apache.org>
Authored: Sat Apr 9 22:57:35 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Apr 9 22:57:35 2016 -0700
----------------------------------------------------------------------
.../projects/XML/src/main/flex/Namespace.as | 9 +--
frameworks/projects/XML/src/main/flex/QName.as | 10 ++-
frameworks/projects/XML/src/main/flex/XML.as | 72 +++++++++++++++++++-
.../projects/XML/src/main/flex/XMLList.as | 33 ++++++++-
4 files changed, 111 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/Namespace.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/Namespace.as b/frameworks/projects/XML/src/main/flex/Namespace.as
index c79ddbe..93f8eab 100644
--- a/frameworks/projects/XML/src/main/flex/Namespace.as
+++ b/frameworks/projects/XML/src/main/flex/Namespace.as
@@ -16,13 +16,12 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class Namespace
{
- public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
+ COMPILE::JS
+ public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
{
/*
When the Namespace constructor is called with a no arguments, one argument uriValue or two arguments prefixValue and uriValue, the following steps are taken:
@@ -119,16 +118,18 @@ package
_prefix = value;
}
+ COMPILE::JS
public function toString():String
{
return uri;
}
+ COMPILE::JS
override public function valueOf():*
{
return this;
}
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index 5232bbe..5ed6d42 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -16,12 +16,11 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class QName
{
+ COMPILE::JS
public function QName(qNameOrUri:*=null,localNameVal:*=null)
{
/*
@@ -96,15 +95,19 @@ package
_prefix = value;
}
+ COMPILE::JS
public function toString():String
{
return _localName;
}
+ COMPILE::JS
public function equals(name:QName):Boolean
{
return this.uri == name.uri && this.localName == name.localName; // this.prefix == name.prefix &&
}
+
+ COMPILE::JS
public function matches(name:QName):Boolean
{
if(this.uri == "*" || name.uri == "*")
@@ -125,6 +128,7 @@ package
_isAttribute = value;
}
+ COMPILE::JS
public function getNamespace(namespaces:Array=null):Namespace
{
/*
@@ -158,5 +162,5 @@ package
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 27a7094..720a6b0 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -16,8 +16,6 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class XML
@@ -31,6 +29,7 @@ package
static private var defaultNamespace:Namespace;
+ COMPILE::JS
static public function setDefaultNamespace(ns:*):void
{
if(!ns)
@@ -86,6 +85,7 @@ package
*/
static public var prettyPrinting:Boolean = true;
+ COMPILE::JS
static private function escapeAttributeValue(value:String):String
{
var outArr:Array = [];
@@ -118,6 +118,7 @@ package
return outArr.join("");
}
+ COMPILE::JS
static private function escapeElementValue(value:String):String
{
var i:int;
@@ -144,6 +145,7 @@ package
return outArr.join("");
}
+ COMPILE::JS
static private function insertAttribute(att:Attr,parent:XML):XML
{
var xml:XML = new XML();
@@ -154,6 +156,7 @@ package
parent.addChild(xml);
return xml;
}
+ COMPILE::JS
static private function iterateElement(node:Element,xml:XML):void
{
var i:int;
@@ -174,6 +177,7 @@ package
* returns an XML object from an existing node without the need to parse the XML.
* The new XML object is not normalized
*/
+ COMPILE::JS
static private function fromNode(node:Element):XML
{
var xml:XML;
@@ -227,6 +231,7 @@ package
return xml;
}
+ COMPILE::JS
static private function namespaceInArray(ns:Namespace,arr:Array,considerPrefix:Boolean=true):Boolean
{
if(!arr)
@@ -245,6 +250,7 @@ package
return false;
}
+ COMPILE::JS
static private function trimXMLWhitespace(value:String):String
{
return value.replace(/^\s+|\s+$/gm,'');
@@ -255,6 +261,7 @@ package
* @return
*
*/
+ COMPILE::JS
static public function defaultSettings():Object
{
return {
@@ -271,6 +278,7 @@ package
* @param rest
*
*/
+ COMPILE::JS
static public function setSettings(value:Object):void
{
if(!value)
@@ -289,6 +297,7 @@ package
* @return
*
*/
+ COMPILE::JS
static public function settings():Object
{
return {
@@ -301,6 +310,7 @@ package
}
+ COMPILE::JS
public function XML(xml:String = null)
{
if(xml)
@@ -357,6 +367,7 @@ package
*
*
*/
+ COMPILE::JS
public function addChild(child:XML):void
{
if(!child)
@@ -384,6 +395,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function addNamespace(ns:Namespace):XML
{
/*
@@ -442,6 +454,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function appendChild(child:XML):XML
{
/*
@@ -478,6 +491,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attribute(attributeName:*):XMLList
{
var i:int;
@@ -502,6 +516,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attributes():XMLList
{
var i:int;
@@ -520,6 +535,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function child(propertyName:Object):XMLList
{
/*
@@ -578,6 +594,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function childIndex():int
{
if(!_parent)
@@ -592,6 +609,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function children():XMLList
{
var i:int;
@@ -609,6 +627,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function comments():XMLList
{
var i:int;
@@ -622,6 +641,7 @@ package
return list;
}
+ COMPILE::JS
public function concat(list:*):XMLList
{
if(list is XML)
@@ -649,6 +669,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function contains(value:XML):Boolean
{
return this.equals(value);
@@ -660,6 +681,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function copy():XML
{
/*
@@ -698,6 +720,7 @@ package
return xml;
}
+ COMPILE::JS
private function deleteChildAt(idx:int):void
{
if(idx < 0)
@@ -716,6 +739,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function descendants(name:Object = "*"):XMLList
{
/*
@@ -766,6 +790,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function elements(name:Object = "*"):XMLList
{
if(!name)
@@ -786,6 +811,7 @@ package
return null;
}
+ COMPILE::JS
public function equals(xml:*):Boolean
{
/*
@@ -842,6 +868,7 @@ package
return true;
}
+ COMPILE::JS
public function hasAttribute(nameOrXML:*,value:String=null):Boolean
{
if(!_attributes)
@@ -869,6 +896,7 @@ package
return false;
}
+ COMPILE::JS
private function getAncestorNamespaces(namespaces:Array):Array
{
//don't modify original
@@ -909,11 +937,13 @@ package
return _children ? _children.slice() : [];
}
+ COMPILE::JS
public function getIndexOf(elem:XML):int
{
return _children.indexOf(elem);
}
+ COMPILE::JS
private function getURI(prefix:String):String
{
var i:int;
@@ -936,6 +966,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasComplexContent():Boolean
{
/*
@@ -956,6 +987,7 @@ package
return false;
}
+ COMPILE::JS
override public function hasOwnProperty(p:*):Boolean
{
/*
@@ -998,6 +1030,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasSimpleContent():Boolean
{
/*
@@ -1024,11 +1057,13 @@ package
* @return
*
*/
+ COMPILE::JS
public function inScopeNamespaces():Array
{
return _namespaces.slice();
}
+ COMPILE::JS
private function insertChildAt(child:XML,idx:int):void{
/*
When the [[Insert]] method of an XML object x is called with property name P and value V, the following steps are taken:
@@ -1067,6 +1102,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function insertChildAfter(child1:XML, child2:XML):XML
{
/*
@@ -1103,6 +1139,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function insertChildBefore(child1:XML, child2:XML):XML
{
/*
@@ -1139,6 +1176,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function length():int
{
return 1;
@@ -1150,6 +1188,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function localName():Object
{
return name().localName;
@@ -1163,6 +1202,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function name():Object
{
if(!_name)
@@ -1177,6 +1217,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function namespace(prefix:String = null):*
{
/*
@@ -1220,6 +1261,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function namespaceDeclarations():Array
{
/*
@@ -1290,6 +1332,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function normalize():XML
{
var len:int = _children.length-1;
@@ -1324,6 +1367,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function parent():*
{
return _parent;
@@ -1335,6 +1379,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function prependChild(child:XML):XML
{
child.setParent(this);
@@ -1351,6 +1396,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function processingInstructions(name:String = "*"):XMLList
{
return null;
@@ -1363,6 +1409,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function removeChild(child:XML):Boolean
{
/*
@@ -1417,6 +1464,7 @@ package
child.setParent(null);
return removed;
}
+ COMPILE::JS
private function removeChildByName(name:*):Boolean
{
var i:int;
@@ -1455,6 +1503,7 @@ package
}
return removedItem;
}
+ COMPILE::JS
public function removeChildAt(index:int):void
{
/*
@@ -1482,6 +1531,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function removeNamespace(ns:*):XML
{
/*
@@ -1543,6 +1593,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function replace(propertyName:Object, value:*):XML
{
/*
@@ -1575,6 +1626,7 @@ package
return null;
}
+ COMPILE::JS
private function replaceChild(idx:int,v:*):void
{
/*
@@ -1628,6 +1680,7 @@ package
}
}
+ COMPILE::JS
private function isAncestor(xml:XML):Boolean
{
var p:XML = parent();
@@ -1640,6 +1693,7 @@ package
return false;
}
+ COMPILE::JS
public function setAttribute(attr:*,value:String):void
{
var i:int;
@@ -1691,6 +1745,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function setChild(elementName:*, elements:Object):void
{
@@ -1809,6 +1864,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function setChildren(value:Object):XML
{
var i:int;
@@ -1861,6 +1917,7 @@ package
* @param name
*
*/
+ COMPILE::JS
public function setLocalName(name:String):void
{
if(!_name)
@@ -1875,6 +1932,7 @@ package
* @param name
*
*/
+ COMPILE::JS
public function setName(name:*):void
{
if(name is QName)
@@ -1889,6 +1947,7 @@ package
* @param ns
*
*/
+ COMPILE::JS
public function setNamespace(ns:Object):void
{
if(_nodeKind == "text" || _nodeKind == "comment" || _nodeKind == "processing-instruction")
@@ -1916,6 +1975,7 @@ package
_nodeKind = value;
}
+ COMPILE::JS
public function setParent(parent:XML):void
{
var oldParent:XML = _parent;
@@ -1936,6 +1996,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function text():XMLList
{
var list:XMLList = new XMLList();
@@ -1969,6 +2030,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toString():String
{
// text, comment, processing-instruction, attribute, or element
@@ -1981,6 +2043,7 @@ package
return toXMLString();
}
+ COMPILE::JS
private function toAttributeName(name:*):QName
{
var qname:QName;
@@ -1994,6 +2057,7 @@ package
qname.isAttribute = true;
return qname;
}
+ COMPILE::JS
private function toXMLName(name:*):QName
{
var qname:QName;
@@ -2049,6 +2113,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toXMLString(indentLevel:int=0,ancestors:Array=null):String
{
/*
@@ -2264,6 +2329,7 @@ package
* @return
*
*/
+ COMPILE::JS
override public function valueOf():*
{
return this;
@@ -2271,4 +2337,4 @@ package
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index cacbfc1..ef16906 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -16,16 +16,16 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class XMLList
{
+ COMPILE::JS
public function XMLList()
{
addIndex(0);
}
+ COMPILE::JS
private var _xmlArray:Array = [];
/*
9.2.1.2 [[Put]] (P, V)
@@ -108,6 +108,7 @@ package
b. Call the [[Put]] method of x[0] with arguments P and V
4. Return
*/
+ COMPILE::JS
private function addIndex(idx:int):void
{
var idxStr:String = "" + idx;
@@ -145,6 +146,7 @@ package
);
}
+ COMPILE::JS
public function appendChild(child:XML):void
{
addIndex(_xmlArray.length);
@@ -158,6 +160,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attribute(attributeName:*):XMLList
{
var retVal:XMLList = new XMLList();
@@ -176,6 +179,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attributes():XMLList
{
var retVal:XMLList = new XMLList();
@@ -195,6 +199,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function child(propertyName:Object):XMLList
{
var retVal:XMLList = new XMLList();
@@ -213,6 +218,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function children():XMLList
{
var retVal:XMLList = new XMLList();
@@ -231,6 +237,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function comments():XMLList
{
var retVal:XMLList = new XMLList();
@@ -244,6 +251,7 @@ package
return retVal;
}
+ COMPILE::JS
public function concat(list:*):XMLList
{
if(list is XML)
@@ -269,6 +277,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function contains(value:XML):Boolean
{
@@ -287,6 +296,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function copy():XMLList
{
var retVal:XMLList = new XMLList();
@@ -304,6 +314,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function descendants(name:Object = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -324,6 +335,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function elements(name:Object = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -337,6 +349,7 @@ package
return retVal;
}
+ COMPILE::JS
public function equals(list:*):Boolean
{
/*
@@ -364,6 +377,7 @@ package
return false;
}
+ COMPILE::JS
public function hasComplexContent():Boolean
{
//what to do with multiple nodes? If anything is complex, we return true.
@@ -378,6 +392,7 @@ package
return false;
}
+ COMPILE::JS
override public function hasOwnProperty(propertyName:*):Boolean
{
/*
@@ -410,6 +425,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasSimpleContent():Boolean
{
//what to do with multiple nodes? If anything is complex, we return false.
@@ -430,6 +446,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function length():int
{
return _xmlArray.length;
@@ -442,6 +459,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function normalize():XMLList
{
/*
@@ -472,6 +490,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function parent():Object
{
if(_xmlArray.length == 0)
@@ -493,6 +512,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function processingInstructions(name:String = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -513,6 +533,7 @@ package
return retVal;
}
+ COMPILE::JS
public function removeChild(child:*):void
{
var i:int;
@@ -538,6 +559,7 @@ package
}
}
+ COMPILE::JS
public function removeChildAt(idx:int):void
{
if(idx >= 0 && idx < _xmlArray.length)
@@ -580,6 +602,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function text():XMLList
{
var retVal:XMLList = new XMLList();
@@ -599,6 +622,7 @@ package
* @return
*
*/
+ COMPILE::JS
override public function toLocaleString():String
{
var retVal:Array = [];
@@ -618,6 +642,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toString():String
{
var retVal:Array = [];
@@ -637,6 +662,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toXMLString():String
{
var retVal:Array = [];
@@ -656,10 +682,11 @@ package
* @return
*
*/
+ COMPILE::JS
override public function valueOf():*
{
return this;
}
}
}
-}
+
[37/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Posted by cd...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
# By Alex Harui
# Via Alex Harui
* 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs:
try to fix checkintests with temporary JS stubs
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/495d0162
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/495d0162
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/495d0162
Branch: refs/heads/feature/maven-migration
Commit: 495d01626e4ea480c1409bd27836ccddeb531e59
Parents: 777436c 6f339dc
Author: Harbs <ha...@in-tools.com>
Authored: Tue Apr 12 08:45:29 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Tue Apr 12 08:45:29 2016 +0300
----------------------------------------------------------------------
build.xml | 2 ++
mustella/js/AssertPropertyValue.js | 37 +++++++++++++++++++++++++++
mustella/js/DispatchMouseClickEvent.js | 37 +++++++++++++++++++++++++++
mustella/js/DispatchMouseEvent.js | 37 +++++++++++++++++++++++++++
mustella/js/ExitWhenDone.js | 37 +++++++++++++++++++++++++++
mustella/js/SendFormattedResultsToLog.js | 37 +++++++++++++++++++++++++++
mustella/js/SetProperty.js | 37 +++++++++++++++++++++++++++
mustella/js/SetShowRTE.js | 37 +++++++++++++++++++++++++++
mustella/js/TestCase.js | 37 +++++++++++++++++++++++++++
mustella/js/UnitTester.js | 37 +++++++++++++++++++++++++++
10 files changed, 335 insertions(+)
----------------------------------------------------------------------
[22/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- XML issues
Posted by cd...@apache.org.
XML issues
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ff4cf692
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ff4cf692
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ff4cf692
Branch: refs/heads/feature/maven-migration
Commit: ff4cf69200035ff5139310ec635b4d35b7df238a
Parents: a5ea916
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 13:29:35 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 13:29:35 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/QName.as | 8 ++++----
frameworks/projects/XML/src/main/flex/XML.as | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff4cf692/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index 5ed6d42..bfd7b40 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -57,11 +57,11 @@ package
if(localNameVal)
_localName = localNameVal.toString();
}
- else if (qNameOrUri.toString())
+ else if (qNameOrUri && qNameOrUri.toString())
{
- _uri = qNameOrUri;
- if(localName)
- _localName = localName;
+ _uri = qNameOrUri.toString();
+ if(localNameVal)
+ _localName = localNameVal;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ff4cf692/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 720a6b0..86a3ed1 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -313,6 +313,7 @@ package
COMPILE::JS
public function XML(xml:String = null)
{
+ _children = [];
if(xml)
{
var parser:DOMParser = new DOMParser();
@@ -807,8 +808,6 @@ package
list.targetObject = this;
list.targetProperty = name;
return list;
-
- return null;
}
COMPILE::JS
[28/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Added XML to main asjs build
Posted by cd...@apache.org.
Added XML to main asjs build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/33d0c00b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/33d0c00b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/33d0c00b
Branch: refs/heads/feature/maven-migration
Commit: 33d0c00b204433935bbaef24b117c98b12ce7a3c
Parents: 1eec8d8
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 19:39:10 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 19:39:10 2016 +0300
----------------------------------------------------------------------
frameworks/build.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/33d0c00b/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 8ba8f75..8d7b174 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -94,6 +94,7 @@
<antcall target="Network"/>
<antcall target="Reflection"/>
<antcall target="Storage"/>
+ <antcall target="XML"/>
</target>
<target name="fonts">
@@ -138,6 +139,7 @@
<ant dir="${basedir}/projects/Network" target="clean"/>
<ant dir="${basedir}/projects/Reflection" target="clean"/>
<ant dir="${basedir}/projects/Storage" target="clean"/>
+ <ant dir="${basedir}/projects/XML" target="clean"/>
<ant dir="${basedir}/fontsrc" target="clean"/>
<!-- delete the FlashBuilder executable directories -->
@@ -229,6 +231,9 @@
<target name="Storage" description="Clean build of Storage.swc">
<ant dir="${basedir}/projects/Storage"/>
</target>
+ <target name="XML" description="Clean build of XML.swc">
+ <ant dir="${basedir}/projects/XML"/>
+ </target>
<target name="flex-config" depends="playerglobal-setswfversion" description="Copy the flex config template to flex-config.xml and inject version numbers">
<copy file="${basedir}/flex-config-template.xml" tofile="${basedir}/flex-config.xml" overwrite="true">
[29/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- XML Fixes More tests
Posted by cd...@apache.org.
XML Fixes
More tests
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d4bce998
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d4bce998
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d4bce998
Branch: refs/heads/feature/maven-migration
Commit: d4bce998c9ab32eccd8ea0e76ec2e8d593655f46
Parents: 33d0c00
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 01:46:58 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 01:46:58 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 19 +++++-
.../projects/XML/src/main/flex/XMLList.as | 65 ++++++++++++--------
manualtests/XMLTest/src/MyInitialView.mxml | 4 ++
3 files changed, 63 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d4bce998/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index c3f212c..288fa35 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -1635,7 +1635,7 @@ package
}
COMPILE::JS
- private function replaceChild(idx:int,v:*):void
+ public function replaceChildAt(idx:int,v:*):void
{
/*
When the [[Replace]] method of an XML object x is called with property name P and value V, the following steps are taken:
@@ -1681,6 +1681,19 @@ package
if(_children[idx])
_children[idx].setParent(null);
+ var len:int = v.length();
+ v[0].setParent(this);
+ _children[idx] = v[0];
+ var listIdx:int = 1;
+ var chld:XML = v[0];
+ while(listIdx < len)
+ {
+ chld = v[listIdx];
+ insertChildAt(chld,idx+listIdx);
+ listIdx++;
+
+ }
+
}
else
{
@@ -2258,6 +2271,10 @@ package
ns.prefix = "";
declarations.push(ns);
}
+ if(XML.prettyPrinting)
+ {
+ strArr.push(new Array(indentLevel).join(' '));
+ }
strArr.push("<");
if(ns.prefix)
strArr.push(ns.prefix+":");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d4bce998/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index ef16906..0f4b2ab 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -116,29 +116,10 @@ package
{
"get": function():* { return _xmlArray[idx]; },
"set": function(newValue:*):void {
- var i:int;
- if(newValue is XML)
- {
- _xmlArray[idx] = newValue;
- }
- else if(newValue is XMLList)
- {
- var len:int = newValue.length();
- for(i=0;i<len;i++)
- {
- // replace the first one and add each additonal one.
- if(i==0)
- _xmlArray[idx] = newValue[i];
- else
- _xmlArray.splice(idx+i,0,newValue[i]);
- }
- }
- // add indexes as necessary
- while(idx++ < _xmlArray.length)
- {
- if(!this.hasOwnProperty(idx))
- addIndex(idx);
- }
+ if(idx >= _xmlArray.length)
+ appendChild(newValue);
+ else
+ replaceChildAt(idx,newValue);
},
enumerable: true,
configurable: true
@@ -149,8 +130,12 @@ package
COMPILE::JS
public function appendChild(child:XML):void
{
- addIndex(_xmlArray.length);
_xmlArray[_xmlArray.length] = child;
+ addIndex(_xmlArray.length);
+ if(_targetObject)
+ {
+ _targetObject.appendChild(child);
+ }
}
/**
@@ -565,6 +550,38 @@ package
if(idx >= 0 && idx < _xmlArray.length)
_xmlArray.splice(idx,1);
}
+ COMPILE::JS
+ private function replaceChildAt(idx:int,child:*):void
+ {
+ var i:int;
+ var childToReplace:XML = _xmlArray[idx];
+ if(childToReplace && _targetObject)
+ {
+ _targetObject.replaceChildAt(childToReplace.childIndex,child);
+ }
+ if(child is XML)
+ {
+ _xmlArray.splice(idx+i,0,child);
+ }
+ else if(child is XMLList)
+ {
+ var len:int = child.length();
+ for(i=0;i<len;i++)
+ {
+ // replace the first one and add each additonal one.
+ if(i==0)
+ _xmlArray[idx] = child[i];
+ else
+ _xmlArray.splice(idx+i,0,child[i]);
+ }
+ }
+ // add indexes as necessary
+ while(idx++ < _xmlArray.length)
+ {
+ if(!this.hasOwnProperty(idx))
+ addIndex(idx);
+ }
+ }
private var _targetObject:*;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d4bce998/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index 34de79a..6451996 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -56,6 +56,10 @@ limitations under the License.
xml1.appendChild(child);
trace(xml1.pop[0].toString());
trace(xml1.pop[1].toString());
+ var pop:XMLList = xml1.pop;
+ pop[pop.length()] = new XML('<pop><child name="Fred"/></pop>');
+ trace(pop.toString());
+ trace(xml1.toString());
}
]]>
</fx:Script>
[02/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- switch to newer rat from maven
Posted by cd...@apache.org.
switch to newer rat from maven
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/164ec03e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/164ec03e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/164ec03e
Branch: refs/heads/feature/maven-migration
Commit: 164ec03e9231789041b50ed80d6f28f724b86288
Parents: f742bc2
Author: Alex Harui <ah...@apache.org>
Authored: Mon Mar 28 21:15:35 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Mar 28 21:15:35 2016 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/164ec03e/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index b01029b..f6dccd1 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -54,9 +54,10 @@
<property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
<property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
- <property name="apache.rat.jar" value="apache-rat-0.8.jar" />
- <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
- <property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
+ <property name="apache.rat.jar" value="apache-rat-0.11.jar" />
+ <property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
+ <property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
+ <property name="apache.rat.tasks.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat-tasks/0.11" />
<property file="${basedir}/approvefalcon.properties"/>
@@ -187,7 +188,7 @@
<get src="${apache.rat.url}/${apache.rat.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.jar}" />
</target>
<target name="install-rat.tasks.jar" unless="apache.rat.tasks.found">
- <get src="${apache.rat.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
+ <get src="${apache.rat.tasks.url}/${apache.rat.tasks.jar}" dest="${env.ANT_HOME}/lib/${apache.rat.tasks.jar}" />
</target>
<target name="rat-taskdef" description="Rat taskdef">
[45/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- need deps.js
Posted by cd...@apache.org.
need deps.js
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/66669cf5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/66669cf5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/66669cf5
Branch: refs/heads/feature/maven-migration
Commit: 66669cf58ea30201899ede6266a2d83405d501c6
Parents: ba6eda5
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 13 11:11:48 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 13 11:11:48 2016 -0700
----------------------------------------------------------------------
frameworks/downloads.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/66669cf5/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index 0b3909a..089fa16 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -174,6 +174,7 @@
<exclude name="closure/goog/array/array.js"/>
<exclude name="closure/goog/asserts/asserts.js"/>
<exclude name="closure/goog/base.js"/>
+ <exclude name="closure/goog/deps.js"/>
<exclude name="closure/goog/debug/entrypointregistry.js"/>
<exclude name="closure/goog/debug/error.js"/>
<exclude name="closure/goog/disposable/disposable.js"/>
[33/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Added support for E4X filtering expressions
Posted by cd...@apache.org.
Added support for E4X filtering expressions
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd1ae8ee
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd1ae8ee
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd1ae8ee
Branch: refs/heads/feature/maven-migration
Commit: fd1ae8ee61bc1a1ed109782fd975efc4937e2be0
Parents: d4dc652
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 15:06:00 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 15:06:00 2016 +0300
----------------------------------------------------------------------
.../projects/XML/src/main/flex/XMLList.as | 23 ++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd1ae8ee/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index d507033..ea7b4ec 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -249,8 +249,14 @@ package
throw new TypeError("invalid type");
var item:XML;
- for each(item in list)
- appendChild(item);
+ //work-around for FLEX-35070
+ var len:int = list.length();
+ var i:int=0;
+ while(i<len)
+ appendChild(list[i++]);
+
+// for each(item in list)
+// appendChild(item);
return this;
}
@@ -361,6 +367,19 @@ package
*/
return false;
}
+ COMPILE::JS
+ public function filter(callback:Function):XMLList
+ {
+ var list:XMLList = new XMLList();
+ for(var i:int = 0;i<_xmlArray.length;i++)
+ {
+ if(callback(_xmlArray[i]))
+ list.appendChild(_xmlArray[i]);
+ }
+ list.targetObject = _targetObject;
+ list.targetProperty = _targetProperty;
+ return list;
+ }
COMPILE::JS
public function hasComplexContent():Boolean
[49/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Added isNaN check because minified version seems to sometimes be NaN Added
debug=false to output minified code as well in test
Posted by cd...@apache.org.
Added isNaN check because minified version seems to sometimes be NaN
Added debug=false to output minified code as well in test
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cf8933e1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cf8933e1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cf8933e1
Branch: refs/heads/feature/maven-migration
Commit: cf8933e1df60313738c956cdab4d092a3cc102a1
Parents: 7c5a215
Author: Harbs <ha...@in-tools.com>
Authored: Fri Apr 15 10:19:46 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Fri Apr 15 10:19:46 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 2 +-
manualtests/build_example.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf8933e1/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index d3ab421..0577abb 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -2243,7 +2243,7 @@ package
var i:int;
var ns:Namespace;
var strArr:Array = [];
-
+ indentLevel = isNaN(indentLevel) ? 0 : indentLevel;
var indentArr:Array = [];
for(i=0;i<indentLevel;i++)
indentArr.push(_indentStr);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cf8933e1/manualtests/build_example.xml
----------------------------------------------------------------------
diff --git a/manualtests/build_example.xml b/manualtests/build_example.xml
index 8debcd6..45714d1 100644
--- a/manualtests/build_example.xml
+++ b/manualtests/build_example.xml
@@ -160,7 +160,7 @@
<jvmarg line="${mxmlc.jvm.args}"/>
<jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="-debug" />
+ <arg value="-debug=false" />
<arg value="${theme_arg}" />
<arg value="-compiler.mxml.children-as-data" />
<arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
[15/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Starting on XML tests
Posted by cd...@apache.org.
Starting on XML tests
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/dbcc3b11
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dbcc3b11
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dbcc3b11
Branch: refs/heads/feature/maven-migration
Commit: dbcc3b118507769026dfda03ca5689993669272e
Parents: 1ffb32f
Author: Harbs <ha...@in-tools.com>
Authored: Wed Apr 6 18:23:33 2016 -0700
Committer: Harbs <ha...@in-tools.com>
Committed: Wed Apr 6 18:23:33 2016 -0700
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XML.as | 4 +
manualtests/XMLTest/build.xml | 72 +++++++++++
manualtests/XMLTest/src/MyInitialView.mxml | 72 +++++++++++
manualtests/XMLTest/src/README.txt | 45 +++++++
manualtests/XMLTest/src/ReflectionTest.mxml | 40 ++++++
.../XMLTest/src/controllers/MyController.as | 52 ++++++++
manualtests/XMLTest/src/models/MyModel.as | 125 +++++++++++++++++++
7 files changed, 410 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 26d185b..27a7094 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -734,6 +734,8 @@ package
5. Return list
*/
var i:int;
+ if(!name)
+ name = "*";
name = toXMLName(name);
var list:XMLList = new XMLList();
if(name.isAttribute)
@@ -766,6 +768,8 @@ package
*/
public function elements(name:Object = "*"):XMLList
{
+ if(!name)
+ name = "*";
name = toXMLName(name);
var i:int;
var list:XMLList = new XMLList();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/build.xml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/build.xml b/manualtests/XMLTest/build.xml
new file mode 100644
index 0000000..6370e2d
--- /dev/null
+++ b/manualtests/XMLTest/build.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<project name="xmltest" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../.."/>
+ <property name="example" value="ReflectionTest" />
+
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
+ <!-- use this to add keep metadata option -->
+ <property name="theme_arg" value="-keep-as3-metadata+=Event" />
+ <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${env.FALCON_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
+ type="file"
+ property="FALCON_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
+
+ <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
+ type="file"
+ property="FALCONJX_HOME"
+ value="${env.FALCONJX_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
+ type="file"
+ property="FALCONJX_HOME"
+ value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
+
+ <available file="${env.GOOG_HOME}/closure/goog/base.js"
+ type="file"
+ property="GOOG_HOME"
+ value="${env.GOOG_HOME}"/>
+
+ <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
+ type="file"
+ property="GOOG_HOME"
+ value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+
+ <include file="${basedir}/../build_example.xml" />
+
+ <target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of FlexJSUI.swc">
+ </target>
+
+ <target name="clean">
+ <delete dir="${basedir}/bin" failonerror="false" />
+ <delete dir="${basedir}/bin-debug" failonerror="false" />
+ <delete dir="${basedir}/bin-release" failonerror="false" />
+ </target>
+
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
new file mode 100644
index 0000000..0f9eab0
--- /dev/null
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+<js:ViewBase xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ xmlns:local="*"
+ xmlns:models="models.*"
+ xmlns:acc="org.apache.flex.html.accessories.*">
+
+ <fx:Style>
+ .title {
+ font-size: 14pt;
+ font-weight: bold;
+ }
+
+ </fx:Style>
+
+ <fx:Script>
+ <![CDATA[
+ import org.apache.flex.core.IPopUpHost;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.utils.UIUtils;
+
+ import org.apache.flex.reflection.describeType;
+ import org.apache.flex.reflection.MetaDataArgDefinition;
+ import org.apache.flex.reflection.MetaDataDefinition;
+ import org.apache.flex.reflection.MethodDefinition;
+ import org.apache.flex.reflection.TypeDefinition;
+
+ [Event(name="foo", type="org.apache.flex.events.Event")]
+ public function runTest():void
+ {
+ var metadata:Array;
+ var mtd:MetaDataDefinition;
+ var mtdarg:MetaDataArgDefinition;
+ var args:Array;
+ var j:int;
+ var m:int;
+ var xml1:XML = <foo baz="true"/>;
+ trace(xmll1);
+ trace(xml1.baz);
+
+ }
+ ]]>
+ </fx:Script>
+
+ <js:Container id="cont" width="600" height="700" x="50" y="50">
+ <js:beads>
+ <js:VerticalLayout />
+ </js:beads>
+
+ <js:Label text="XML Test" className="title" />
+ <js:TextButton text="Test" click="runTest()" />
+ </js:Container>
+
+</js:ViewBase>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/src/README.txt
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/README.txt b/manualtests/XMLTest/src/README.txt
new file mode 100644
index 0000000..f38df7f
--- /dev/null
+++ b/manualtests/XMLTest/src/README.txt
@@ -0,0 +1,45 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+DESCRIPTION
+
+The FormExample application demonstrates several FlexJS components and how they
+can be aligned in a column, much like you would see in a form.
+
+This Flex application may be run as a Flash SWF or cross-compiled (using Falcon JX)
+into JavaScript and HTML and run without Flash.
+
+The components are placed into a Container with a VerticalColumnLayout bead. This bead
+examines each of the children in the Container and aligns them in two columns.
+
+COMPONENTS and BEADS
+
+- Container
+- DateField
+- Label
+- TextInput
+
+- NonVirtualVerticalLayout
+- NumericOnlyTextInputBead
+- VerticalColumnLayout
+
+NOTES
+
+The cross-compilation to JavaScript often results in non-fatal warnings. Some of these warnings
+should be addressed in future releases of the Falcon JX compiler.
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/src/ReflectionTest.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/ReflectionTest.mxml b/manualtests/XMLTest/src/ReflectionTest.mxml
new file mode 100644
index 0000000..27e97b5
--- /dev/null
+++ b/manualtests/XMLTest/src/ReflectionTest.mxml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!---
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+-->
+<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:local="*"
+ xmlns:models="models.*"
+ xmlns:controllers="controllers.*"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ >
+
+ <js:valuesImpl>
+ <js:SimpleCSSValuesImpl />
+ </js:valuesImpl>
+ <js:controller>
+ <controllers:MyController />
+ </js:controller>
+ <js:model>
+ <models:MyModel />
+ </js:model>
+ <js:initialView>
+ <local:MyInitialView />
+ </js:initialView>
+</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/src/controllers/MyController.as
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/controllers/MyController.as b/manualtests/XMLTest/src/controllers/MyController.as
new file mode 100644
index 0000000..81eb963
--- /dev/null
+++ b/manualtests/XMLTest/src/controllers/MyController.as
@@ -0,0 +1,52 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package controllers
+{
+ import org.apache.flex.events.Event;
+
+ import org.apache.flex.core.Application;
+ import org.apache.flex.core.IDocument;
+
+ import models.MyModel;
+
+ public class MyController implements IDocument
+ {
+ public function MyController(app:Application = null)
+ {
+ if (app)
+ {
+ this.app = app as ReflectionTest;
+ app.addEventListener("viewChanged", viewChangeHandler);
+ }
+ }
+
+ private var app:ReflectionTest;
+
+ private function viewChangeHandler(event:Event):void
+ {
+ }
+
+ public function setDocument(document:Object, id:String = null):void
+ {
+ this.app = document as ReflectionTest;
+ app.addEventListener("viewChanged", viewChangeHandler);
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dbcc3b11/manualtests/XMLTest/src/models/MyModel.as
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/models/MyModel.as b/manualtests/XMLTest/src/models/MyModel.as
new file mode 100644
index 0000000..5a16d02
--- /dev/null
+++ b/manualtests/XMLTest/src/models/MyModel.as
@@ -0,0 +1,125 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package models
+{
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+
+ public class MyModel extends EventDispatcher
+ {
+ public function MyModel()
+ {
+ }
+
+ private var _requestedField:String = "Ask";
+
+ [Bindable("requestedFieldChanged")]
+ public function get requestedField():String
+ {
+ return _requestedField;
+ }
+
+ public function set requestedField(value:String):void
+ {
+ if (value != _requestedField)
+ {
+ _requestedField = value;
+ dispatchEvent(new Event("requestedFieldChanged"));
+ if (_responseData)
+ dispatchEvent(new Event("responseTextChanged"));
+ }
+ }
+
+ [Bindable("responseTextChanged")]
+ public function get responseText():String
+ {
+ if (_responseData == null)
+ return "";
+ if (_responseData == "No Data")
+ return _responseData as String;
+ var s:String = _responseData[_requestedField];
+ if (s == null)
+ {
+ if (_requestedField == "Ask")
+ s = _responseData["Bid"];
+ }
+ return s;
+ }
+
+ private var _responseData:Object;
+
+ [Bindable("responseDataChanged")]
+ public function get responseData():Object
+ {
+ return _responseData;
+ }
+
+ public function set responseData(value:Object):void
+ {
+ if (value != _responseData)
+ {
+ _responseData = value;
+ _allData = "";
+ dispatchEvent(new Event("responseDataChanged"));
+ dispatchEvent(new Event("responseTextChanged"));
+ }
+ }
+
+ private var _allData:String = "";
+
+ [Bindable("responseDataChanged")]
+ public function get allData():String
+ {
+ if (_allData == "" && _responseData != null)
+ {
+ for (var p:String in _responseData)
+ {
+ _allData += p + ": " + _responseData[p] + "\n";
+ }
+ }
+ return _allData;
+ }
+
+
+ private var _stockSymbol:String;
+
+ [Bindable("stockSymbolChanged")]
+ public function get stockSymbol():String
+ {
+ return _stockSymbol;
+ }
+
+ public function set stockSymbol(value:String):void
+ {
+ if (value != _stockSymbol)
+ {
+ _stockSymbol = value;
+ dispatchEvent(new Event("stockSymbolChanged"));
+ }
+ }
+
+ private var _strings:Array = ["AAPL", "ADBE", "GOOG", "MSFT", "YHOO"];
+ [Bindable("__NoChangeEvent__")]
+ public function get strings():Array
+ {
+ return _strings;
+ }
+
+ }
+}
\ No newline at end of file
[04/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix files in LICENSE
Posted by cd...@apache.org.
fix files in LICENSE
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7cd1bd4a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7cd1bd4a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7cd1bd4a
Branch: refs/heads/feature/maven-migration
Commit: 7cd1bd4a3bfdfdd4433eb0555d698ef1f19495f6
Parents: fb682e0
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 08:31:50 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 08:31:50 2016 -0700
----------------------------------------------------------------------
LICENSE | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cd1bd4a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a3c1df1..15de483 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,7 +210,7 @@ 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/Flat/as/defaults.css is based on
+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.
@@ -218,7 +218,7 @@ The map image in examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
was placed into the Public Domain by its author. See:
https://commons.wikimedia.org/wiki/File:Bayarea_map.png
-The map coordinates in examples/native/USStatesMap/src/MapCoords.js
+The map coordinates in examples/native/USStatesMap/src/MapCoords.as
were placed into the Public Domain by its author. See:
https://en.wikipedia.org/wiki/File:USA_CIA_Map.svg#file
[27/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Moved QName and Namespace to Core Bug fixes
Posted by cd...@apache.org.
Moved QName and Namespace to Core
Bug fixes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1eec8d8d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1eec8d8d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1eec8d8d
Branch: refs/heads/feature/maven-migration
Commit: 1eec8d8d2ee2cdc6186adb1de2a0da690cdec5bf
Parents: 62e69f5
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 18:52:16 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 18:52:16 2016 +0300
----------------------------------------------------------------------
.../projects/Core/src/main/flex/Namespace.as | 129 +++++++++++---
frameworks/projects/Core/src/main/flex/QName.as | 167 +++++++++++++++---
.../projects/XML/src/main/flex/Namespace.as | 135 ---------------
frameworks/projects/XML/src/main/flex/QName.as | 169 -------------------
frameworks/projects/XML/src/main/flex/XML.as | 9 +-
manualtests/XMLTest/src/MyInitialView.mxml | 7 +-
6 files changed, 262 insertions(+), 354 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/frameworks/projects/Core/src/main/flex/Namespace.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/Namespace.as b/frameworks/projects/Core/src/main/flex/Namespace.as
index 305d88c..93f8eab 100644
--- a/frameworks/projects/Core/src/main/flex/Namespace.as
+++ b/frameworks/projects/Core/src/main/flex/Namespace.as
@@ -16,35 +16,120 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package {
-
-/**
- * Namespace implementation for JS
- */
-public class Namespace
+package
{
- public function Namespace(param1:*, param2:* = undefined)
+ public class Namespace
{
- if (param2 !== undefined)
+ COMPILE::JS
+ public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
{
- uri = param2;
- prefix = param1;
+ /*
+ When the Namespace constructor is called with a no arguments, one argument uriValue or two arguments prefixValue and uriValue, the following steps are taken:
+ 1. Create a new Namespace object n
+ 2. If prefixValue is not specified and uriValue is not specified
+ a. Let n.prefix be the empty string
+ b. Let n.uri be the empty string
+ 3. Else if prefixValue is not specified
+ a. If Type(uriValue) is Object and uriValue.[[Class]] == "Namespace"
+ i. Let n.prefix = uriValue.prefix
+ ii. Let n.uri = uriValue.uri
+ b. Else if Type(uriValue) is Object and uriValue.[[Class]] == "QName" and uriValue.uri is not null
+ i. Let n.uri = uriValue.uri NOTE implementations that preserve prefixes in qualified names may also set n.prefix = uriValue.[[Prefix]]
+ c. Else
+ i. Let n.uri = ToString(uriValue)
+ ii. If (n.uri is the empty string), let n.prefix be the empty string
+ iii. Else n.prefix = undefined
+ 4. Else
+ a. If Type(uriValue) is Object and uriValue.[[Class]] == "QName" and uriValue.uri is not null
+ i. Let n.uri = uriValue.uri
+ b. Else
+ i. Let n.uri = ToString(uriValue)
+ c. If n.uri is the empty string
+ i. If prefixValue is undefined or ToString(prefixValue) is the empty string
+ 1. Let n.prefix be the empty string
+ ii. Else throw a TypeError exception
+ d. Else if prefixValue is undefined, let n.prefix = undefined
+ e. Else if isXMLName(prefixValue) == false
+ i. Let n.prefix = undefined
+ f. Else let n.prefix = ToString(prefixValue)
+ 5. Return n
+ */
+ if(!uriValue && prefixOrUri) //we don't have a prefix defined
+ {
+ var uriVal:Object = uriValue ? uriValue : prefixOrUri;
+ if(uriVal is Namespace)
+ {
+ _prefix = (uriVal as Namespace).prefix;
+ _uri = (uriVal as Namespace).uri;
+ }
+ else if(uriVal is QName)
+ {
+ if((uriVal as QName).uri)
+ _uri = (uriVal as QName).uri;
+ }
+ else {
+ _uri = uriVal.toString();
+ if(_uri == "")
+ _prefix = "";
+ }
+ }
+ else if(uriValue)
+ {
+ // something is specified as the URI otherwise fall through and leave both the prefix and uri blank
+ if(uriValue is QName)
+ {
+ if((uriValue as QName).uri)
+ _uri = (uriValue as QName).uri;
+ }
+ else {
+ _uri = uriValue.toString();
+ }
+
+ if(!_uri)
+ {
+ if(!prefixOrUri)
+ _prefix = "";
+ else
+ throw new TypeError("invalid prefix");
+ }
+ else
+ _prefix = prefixOrUri.toString();
+
+ }
}
- else
+
+ private var _uri:String = "";
+ public function get uri():String
{
- uri = param1;
+ return _uri;
+ }
+ public function set uri(value:String):void
+ {
+ _uri = value;
+ }
+
+ private var _prefix:String = null;
+ public function get prefix():String
+ {
+ return _prefix;
+ }
+ public function set prefix(value:String):void
+ {
+ _prefix = value;
+ }
+
+ COMPILE::JS
+ public function toString():String
+ {
+ return uri;
+ }
+
+ COMPILE::JS
+ override public function valueOf():*
+ {
+ return this;
}
}
-
- public var uri:String;
- public var prefix:String;
-
- public function toString():String
- {
- return uri;
- }
-
}
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/frameworks/projects/Core/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/QName.as b/frameworks/projects/Core/src/main/flex/QName.as
index 26c398b..057b9d5 100644
--- a/frameworks/projects/Core/src/main/flex/QName.as
+++ b/frameworks/projects/Core/src/main/flex/QName.as
@@ -16,38 +16,155 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package {
-
-/**
- * QName implementation for JS
- */
-public class QName
+package
{
- public function QName(param1:Object, localName:String = null)
+ public class QName
{
- if (param1 is QName)
+ COMPILE::JS
+ public function QName(qNameOrUri:*=null,localNameVal:*=null)
{
- var q:QName = param1 as QName;
- uri = q.uri;
- localName = q.localName;
+ /*
+ When the QName constructor is called with a one argument Name or two arguments Namespace and Name the following steps are taken:
+ 1. If (Type(Name) is Object and Name.[[Class]] == "QName")
+ a. If (Namespace is not specified), return a copy of Name
+ b. Else let Name = Name.localName
+ 2. If (Name is undefined or not specified)
+ a. Let Name = “”
+ 3. Else let Name = ToString(Name)
+ 4. If (Namespace is undefined or not specified)
+ a. If Name = "*"
+ i. Let Namespace = null
+ b. Else
+ i. Let Namespace = GetDefaultNamespace()
+ 5. Let q be a new QName with q.localName = Name
+ 6. If Namespace == null
+ a. Let q.uri = null NOTE implementations that preserve prefixes in qualified names may also set q.[[Prefix]] to undefined
+ 7. Else
+ a. Let Namespace be a new Namespace created as if by calling the constructor new Namespace(Namespace)
+ b. Let q.uri = Namespace.uri NOTE implementations that preserve prefixes in qualified names may also set q.[[Prefix]] to Namespace.prefix
+ 8. Return q
+ */
+ if(qNameOrUri is QName)
+ {
+ _uri = qNameOrUri.uri;
+ _localName = qNameOrUri.localName;
+ _prefix = qNameOrUri.prefix;
+ }
+ else if(qNameOrUri is Namespace)
+ {
+ _uri = (qNameOrUri as Namespace).uri;
+ _prefix = (qNameOrUri as Namespace).prefix;
+ if(localNameVal)
+ _localName = localNameVal.toString();
+ }
+ else if(localNameVal)
+ {
+ _localName = localNameVal;
+ _uri = qNameOrUri;
+ }
+ else if (qNameOrUri && qNameOrUri.toString())
+ {
+ _localName = qNameOrUri.toString();
+ }
}
- else if (param1 is Namespace)
+
+ private var _uri:String;
+ public function get uri():String
{
- var n:Namespace = param1 as Namespace;
- uri = n.uri;
- this.localName = localName;
+ return _uri;
}
+ public function set uri(value:String):void
+ {
+ _uri = value;
+ }
+
+ private var _localName:String;
+ public function get localName():String
+ {
+ return _localName;
+ }
+ public function set localName(value:String):void
+ {
+ _localName = value;
+ }
+
+ private var _prefix:String;
+ public function get prefix():String
+ {
+ return _prefix;
+ }
+ public function set prefix(value:String):void
+ {
+ _prefix = value;
+ }
+
+ COMPILE::JS
+ public function toString():String
+ {
+ var uriVal:String = _uri ? _uri : "*";
+ return uriVal + "::" + _localName;
+ }
+
+ COMPILE::JS
+ public function equals(name:QName):Boolean
+ {
+ return this.uri == name.uri && this.localName == name.localName; // this.prefix == name.prefix &&
+ }
+
+ COMPILE::JS
+ public function matches(name:QName):Boolean
+ {
+ if(this.uri == "*" || name.uri == "*")
+ return this.localName == "*" || name.localName == "*" || this.localName == name.localName;
+
+ if(this.localName == "*" || name.localName == "*")
+ return this.uri == name.uri;
+
+ return this.uri == name.uri && this.localName == name.localName;
+ }
+ private var _isAttribute:Boolean;
+ public function get isAttribute():Boolean
+ {
+ return _isAttribute;
+ }
+ public function set isAttribute(value:Boolean):void
+ {
+ _isAttribute = value;
+ }
+
+ COMPILE::JS
+ public function getNamespace(namespaces:Array=null):Namespace
+ {
+ /*
+ When the [[GetNamespace]] method of a QName q is called with no arguments or one argument InScopeNamespaces, the following steps are taken:
+ 1. If q.uri is null, throw a TypeError exception NOTE the exception above should never occur due to the way [[GetNamespace]] is called in this specification
+ 2. If InScopeNamespaces was not specified, let InScopeNamespaces = { }
+ 3. Find a Namespace ns in InScopeNamespaces, such that ns.uri == q.uri. If more than one such Namespace ns exists, the implementation may choose one of the matching Namespaces arbitrarily. NOTE implementations that preserve prefixes in qualified names may additionally constrain ns, such that ns.prefix == q.[[Prefix]]
+ 4. If no such namespace ns exists
+ a. Let ns be a new namespace created as if by calling the constructor new Namespace(q.uri) NOTE implementations that preserve prefixes and qualified names may create the new namespaces as if by calling the constructor Namespace(q.[[Prefix]], q.uri)
+ 5. Return ns
+ */
+ var i:int;
+ var possibleMatch:Namespace;
+ if(!namespaces)
+ namespaces = [];
+ for(i=0;i<namespaces.length;i++)
+ {
+ if(namespaces[i].uri == _uri)
+ {
+ possibleMatch = namespaces[i];
+ if(namespaces[i].prefix == _prefix)
+ return namespaces[i];
+ }
+ }
+ if(possibleMatch)
+ return possibleMatch;
+ if(!_prefix)
+ return new Namespace(_uri);
+ return new Namespace(_prefix,_uri);
+ }
+
}
-
- public var uri:String;
- public var localName:String;
-
- public function toString():String
- {
- return uri + "::" + localName;
- }
-
}
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/frameworks/projects/XML/src/main/flex/Namespace.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/Namespace.as b/frameworks/projects/XML/src/main/flex/Namespace.as
deleted file mode 100644
index 93f8eab..0000000
--- a/frameworks/projects/XML/src/main/flex/Namespace.as
+++ /dev/null
@@ -1,135 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package
-{
- public class Namespace
- {
- COMPILE::JS
- public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
- {
- /*
- When the Namespace constructor is called with a no arguments, one argument uriValue or two arguments prefixValue and uriValue, the following steps are taken:
- 1. Create a new Namespace object n
- 2. If prefixValue is not specified and uriValue is not specified
- a. Let n.prefix be the empty string
- b. Let n.uri be the empty string
- 3. Else if prefixValue is not specified
- a. If Type(uriValue) is Object and uriValue.[[Class]] == "Namespace"
- i. Let n.prefix = uriValue.prefix
- ii. Let n.uri = uriValue.uri
- b. Else if Type(uriValue) is Object and uriValue.[[Class]] == "QName" and uriValue.uri is not null
- i. Let n.uri = uriValue.uri NOTE implementations that preserve prefixes in qualified names may also set n.prefix = uriValue.[[Prefix]]
- c. Else
- i. Let n.uri = ToString(uriValue)
- ii. If (n.uri is the empty string), let n.prefix be the empty string
- iii. Else n.prefix = undefined
- 4. Else
- a. If Type(uriValue) is Object and uriValue.[[Class]] == "QName" and uriValue.uri is not null
- i. Let n.uri = uriValue.uri
- b. Else
- i. Let n.uri = ToString(uriValue)
- c. If n.uri is the empty string
- i. If prefixValue is undefined or ToString(prefixValue) is the empty string
- 1. Let n.prefix be the empty string
- ii. Else throw a TypeError exception
- d. Else if prefixValue is undefined, let n.prefix = undefined
- e. Else if isXMLName(prefixValue) == false
- i. Let n.prefix = undefined
- f. Else let n.prefix = ToString(prefixValue)
- 5. Return n
- */
- if(!uriValue && prefixOrUri) //we don't have a prefix defined
- {
- var uriVal:Object = uriValue ? uriValue : prefixOrUri;
- if(uriVal is Namespace)
- {
- _prefix = (uriVal as Namespace).prefix;
- _uri = (uriVal as Namespace).uri;
- }
- else if(uriVal is QName)
- {
- if((uriVal as QName).uri)
- _uri = (uriVal as QName).uri;
- }
- else {
- _uri = uriVal.toString();
- if(_uri == "")
- _prefix = "";
- }
- }
- else if(uriValue)
- {
- // something is specified as the URI otherwise fall through and leave both the prefix and uri blank
- if(uriValue is QName)
- {
- if((uriValue as QName).uri)
- _uri = (uriValue as QName).uri;
- }
- else {
- _uri = uriValue.toString();
- }
-
- if(!_uri)
- {
- if(!prefixOrUri)
- _prefix = "";
- else
- throw new TypeError("invalid prefix");
- }
- else
- _prefix = prefixOrUri.toString();
-
- }
- }
-
- private var _uri:String = "";
- public function get uri():String
- {
- return _uri;
- }
- public function set uri(value:String):void
- {
- _uri = value;
- }
-
- private var _prefix:String = null;
- public function get prefix():String
- {
- return _prefix;
- }
- public function set prefix(value:String):void
- {
- _prefix = value;
- }
-
- COMPILE::JS
- public function toString():String
- {
- return uri;
- }
-
- COMPILE::JS
- override public function valueOf():*
- {
- return this;
- }
- }
-}
-
-
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
deleted file mode 100644
index 70298f9..0000000
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ /dev/null
@@ -1,169 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package
-{
- public class QName
- {
- COMPILE::JS
- public function QName(qNameOrUri:*=null,localNameVal:*=null)
- {
- /*
- When the QName constructor is called with a one argument Name or two arguments Namespace and Name the following steps are taken:
- 1. If (Type(Name) is Object and Name.[[Class]] == "QName")
- a. If (Namespace is not specified), return a copy of Name
- b. Else let Name = Name.localName
- 2. If (Name is undefined or not specified)
- a. Let Name = “”
- 3. Else let Name = ToString(Name)
- 4. If (Namespace is undefined or not specified)
- a. If Name = "*"
- i. Let Namespace = null
- b. Else
- i. Let Namespace = GetDefaultNamespace()
- 5. Let q be a new QName with q.localName = Name
- 6. If Namespace == null
- a. Let q.uri = null NOTE implementations that preserve prefixes in qualified names may also set q.[[Prefix]] to undefined
- 7. Else
- a. Let Namespace be a new Namespace created as if by calling the constructor new Namespace(Namespace)
- b. Let q.uri = Namespace.uri NOTE implementations that preserve prefixes in qualified names may also set q.[[Prefix]] to Namespace.prefix
- 8. Return q
- */
- if(qNameOrUri is QName)
- {
- _uri = qNameOrUri.uri;
- _localName = qNameOrUri.localName;
- _prefix = qNameOrUri.prefix;
- }
- else if(qNameOrUri is Namespace)
- {
- _uri = (qNameOrUri as Namespace).uri;
- _prefix = (qNameOrUri as Namespace).prefix;
- if(localNameVal)
- _localName = localNameVal.toString();
- }
- else if(localNameVal)
- {
- _localName = localNameVal;
- }
- else if (qNameOrUri && qNameOrUri.toString())
- {
- _localName = qNameOrUri.toString();
- }
- }
-
- private var _uri:String;
- public function get uri():String
- {
- return _uri;
- }
- public function set uri(value:String):void
- {
- _uri = value;
- }
-
- private var _localName:String;
- public function get localName():String
- {
- return _localName;
- }
- public function set localName(value:String):void
- {
- _localName = value;
- }
-
- private var _prefix:String;
- public function get prefix():String
- {
- return _prefix;
- }
- public function set prefix(value:String):void
- {
- _prefix = value;
- }
-
- COMPILE::JS
- public function toString():String
- {
- var uriVal:String = _uri ? _uri : "*";
- return uriVal + "::" + _localName;
- }
-
- COMPILE::JS
- public function equals(name:QName):Boolean
- {
- return this.uri == name.uri && this.localName == name.localName; // this.prefix == name.prefix &&
- }
-
- COMPILE::JS
- public function matches(name:QName):Boolean
- {
- if(this.uri == "*" || name.uri == "*")
- return this.localName == "*" || name.localName == "*" || this.localName == name.localName;
-
- if(this.localName == "*" || name.localName == "*")
- return this.uri == name.uri;
-
- return this.uri == name.uri && this.localName == name.localName;
- }
- private var _isAttribute:Boolean;
- public function get isAttribute():Boolean
- {
- return _isAttribute;
- }
- public function set isAttribute(value:Boolean):void
- {
- _isAttribute = value;
- }
-
- COMPILE::JS
- public function getNamespace(namespaces:Array=null):Namespace
- {
- /*
- When the [[GetNamespace]] method of a QName q is called with no arguments or one argument InScopeNamespaces, the following steps are taken:
- 1. If q.uri is null, throw a TypeError exception NOTE the exception above should never occur due to the way [[GetNamespace]] is called in this specification
- 2. If InScopeNamespaces was not specified, let InScopeNamespaces = { }
- 3. Find a Namespace ns in InScopeNamespaces, such that ns.uri == q.uri. If more than one such Namespace ns exists, the implementation may choose one of the matching Namespaces arbitrarily. NOTE implementations that preserve prefixes in qualified names may additionally constrain ns, such that ns.prefix == q.[[Prefix]]
- 4. If no such namespace ns exists
- a. Let ns be a new namespace created as if by calling the constructor new Namespace(q.uri) NOTE implementations that preserve prefixes and qualified names may create the new namespaces as if by calling the constructor Namespace(q.[[Prefix]], q.uri)
- 5. Return ns
- */
- var i:int;
- var possibleMatch:Namespace;
- if(!namespaces)
- namespaces = [];
- for(i=0;i<namespaces.length;i++)
- {
- if(namespaces[i].uri == _uri)
- {
- possibleMatch = namespaces[i];
- if(namespaces[i].prefix == _prefix)
- return namespaces[i];
- }
- }
- if(possibleMatch)
- return possibleMatch;
- if(!_prefix)
- return new Namespace(_uri);
- return new Namespace(_prefix,_uri);
- }
-
- }
-}
-
-
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 93ba2b1..c3f212c 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -183,12 +183,15 @@ package
var xml:XML;
var i:int;
var data:* = node.nodeValue;
+ var qname:QName = new QName(node.namespaceURI,node.nodeName);
+ qname.prefix = node.prefix;
switch(node.nodeType)
{
case 1:
//ELEMENT_NODE
xml = new XML();
xml.setNodeKind("element");
+ xml.setName(qname);
iterateElement(node,xml);
break;
//case 2:break;// ATTRIBUTE_NODE (handled separately)
@@ -196,11 +199,13 @@ package
//TEXT_NODE
xml = new XML();
xml.setNodeKind("text");
+ xml.setName(qname);
xml.setValue(data);
break;
case 4:
//CDATA_SECTION_NODE
xml = new XML();
+ xml.setName(qname);
xml.setNodeKind("text");
data = "<![CDATA[" + data + "]]>";
xml.setValue(data);
@@ -211,7 +216,7 @@ package
//PROCESSING_INSTRUCTION_NODE
xml = new XML();
xml.setNodeKind("processing-instruction");
- xml.setName(node.nodeName);
+ xml.setName(qname);
xml.setValue(data);
break;
case 8:
@@ -563,7 +568,7 @@ package
*/
var i:int;
var list:XMLList = new XMLList();
- if(parseInt(name,10).toString() == propertyName)
+ if(parseInt(propertyName,10).toString() == propertyName)
{
if(propertyName != "0")
return null;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1eec8d8d/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index e57a0fc..34de79a 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -50,7 +50,12 @@ limitations under the License.
trace(xml1.toXMLString() == '<foo baz="true"/>');
var baz:XMLList = xml1.@baz;
trace("baz: " + xml1.@baz.toString() + " //true");
-
+ var child:XML = <pop><child name="Sam"/></pop>;
+ xml1.appendChild(child);
+ child = new XML('<pop><child name="George"/></pop>');
+ xml1.appendChild(child);
+ trace(xml1.pop[0].toString());
+ trace(xml1.pop[1].toString());
}
]]>
</fx:Script>
[12/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Add AngularJS + Angular Material example. Need to figure out what to do
about the externs swc files.
Posted by cd...@apache.org.
Add AngularJS + Angular Material example. Need to figure out what to do about the externs swc files.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/894b5264
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/894b5264
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/894b5264
Branch: refs/heads/feature/maven-migration
Commit: 894b5264e4972b48d6c4bbaa925540c44d48bee8
Parents: e85d9e1
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Sat Apr 2 02:55:26 2016 -0700
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Sat Apr 2 02:56:10 2016 -0700
----------------------------------------------------------------------
.../AngularExample/AngularExample-debug.html | 28 +++++++++
.../AngularExample/AngularExample-release.html | 29 +++++++++
.../native/AngularExample/src/AngularExample.as | 66 ++++++++++++++++++++
.../native/AngularExample/src/MyController.as | 52 +++++++++++++++
.../src/components/IWebComponent.as | 9 +++
.../src/components/WebComponent.as | 20 ++++++
.../src/components/mdbutton/MDButton.as | 43 +++++++++++++
.../src/components/mdbutton/MDButtonFactory.as | 38 +++++++++++
8 files changed, 285 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/AngularExample-debug.html
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/AngularExample-debug.html b/examples/native/AngularExample/AngularExample-debug.html
new file mode 100644
index 0000000..51aa820
--- /dev/null
+++ b/examples/native/AngularExample/AngularExample-debug.html
@@ -0,0 +1,28 @@
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8"/>
+ <title>AngularExample Debug Build</title>
+
+ <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+
+ <script src="bin/js-debug/library/closure/goog/base.js"></script>
+ <script src="bin/js-debug/AngularExample-dependencies.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+
+ <!-- Angular Material requires Angular.js Libraries -->
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-animate.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-aria.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-messages.min.js"></script>
+
+ <!-- Angular Material Library -->
+ <script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
+ </head>
+ <body>
+ <script>
+ new AngularExample();
+ </script>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/AngularExample-release.html
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/AngularExample-release.html b/examples/native/AngularExample/AngularExample-release.html
new file mode 100644
index 0000000..8d329be
--- /dev/null
+++ b/examples/native/AngularExample/AngularExample-release.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8"/>
+ <title>AngularExample Release Build</title>
+ <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.css">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+
+ <script src="bin/js-debug/library/closure/goog/base.js"></script>
+ <script src="bin/js-debug/AngularExample-dependencies.js"></script>
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+
+ <!-- Angular Material requires Angular.js Libraries -->
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-animate.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-aria.min.js"></script>
+ <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.4.8/angular-messages.min.js"></script>
+
+ <!-- Angular Material Library -->
+ <script src="http://ajax.googleapis.com/ajax/libs/angular_material/1.0.0/angular-material.min.js"></script>
+
+ <script src="bin/js-release/AngularExample.js"></script>
+ </head>
+ <body>
+ <script>
+ new AngularExample();
+ </script>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/AngularExample.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/AngularExample.as b/examples/native/AngularExample/src/AngularExample.as
new file mode 100644
index 0000000..58517b5
--- /dev/null
+++ b/examples/native/AngularExample/src/AngularExample.as
@@ -0,0 +1,66 @@
+package {
+ import angular.IModule;
+
+ import components.mdbutton.MDButton;
+ import components.mdbutton.MDButtonFactory;
+ /**
+ * @author omuppirala
+ */
+ public class AngularExample {
+
+ private var app:IModule;
+
+ public function AngularExample() {
+ //set up angular app
+ app = angular.module("app",["ngMaterial"]);
+ app.controller("MyController", ["$scope", "$mdDialog", MyController]);
+ document.body.setAttribute("ng-app", "app");
+
+ //App container
+ var container:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ container.style.width = '100%';
+ container.style.height = '100%';
+ container.setAttribute("layout", "row");
+ container.setAttribute("layout-align", "center center");
+ document.body.appendChild(container);
+
+ //App
+ var div:HTMLDivElement = document.createElement('div') as HTMLDivElement;
+ div.id = 'div';
+ div.style.width = '50%';
+ div.style.height = '50%';
+ div.setAttribute("layout", "column");
+ div.setAttribute("layout-align", "center center");
+
+ div.setAttribute("ng-controller", "MyController");
+ div.setAttribute("md-whiteframe", "18");
+ div.setAttribute("class", "md-whiteframe-14dp");
+ container.appendChild(div);
+
+ //App children
+ div.innerHTML = '<h1>FlexJS + Angular + Angular Material Demo</h1>';
+ div.innerHTML += '<span flex />';
+ div.innerHTML += '<md-button id="myBtn" class="md-primary md-raised" ng-click="handleBtnClick()">{{btnLabelStr}}</md-button>';
+// div.innerHTML += '<md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker>';
+// div.innerHTML += '<md-progress-circular md-mode="indeterminate"></md-progress-circular>';
+ div.innerHTML += '<md-input-container class="md-block" flex-gt-sm><label>Change button label...</label><input ng-model="btnLabelStr"></md-input-container>';
+ div.innerHTML += '<span flex />';
+
+// var labelButtonClass:Object = MDButtonFactory.getInstance().getButtonClass();
+// var labelButton:MDButton = new labelButtonClass();
+// labelButton.setAttribute("class", "md-primary md-raised");
+// div.appendChild(labelButton);
+// labelButton.setLabel("Label Button");
+
+// var cakeButtonClass:Object = MDButtonFactory.getInstance().getButtonClass();
+// var cakeButton:MDButton = new cakeButtonClass();
+// cakeButton.setAttribute("class", "md-fab");
+// //cakeButton.setAttribute("md-no-ink", "");
+// div.appendChild(cakeButton);
+// cakeButton.setIcon("cake");
+// cakeButton.clickHandler("handleBtnClick");
+
+ }
+
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/MyController.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/MyController.as b/examples/native/AngularExample/src/MyController.as
new file mode 100644
index 0000000..a38c0cd
--- /dev/null
+++ b/examples/native/AngularExample/src/MyController.as
@@ -0,0 +1,52 @@
+package {
+ import angular.material.MDAlertDialog;
+ import angular.material.MDDialogService;
+ import angular.IScope;
+ /**
+ * @author omuppirala
+ */
+
+ public class MyController {
+
+ private var $scope:IScope;
+ private var $mdDialog:MDDialogService;
+
+ public function MyController(scope:IScope,mdDialog:MDDialogService) {
+ this.$scope = scope;
+ this.$mdDialog = mdDialog;
+ this.$scope["handleBtnClick"] = this.handleBtnClick;
+ this.$scope["close"] = this.close;
+ this.$scope["myDate"] = new Date();
+ this.$scope["btnLabelStr"] = "Click me";
+
+ //setupWatchForDate();
+ }
+
+ private function setupWatchForDate() : void {
+ $scope.$watch('myDate', this.handleDateChange,true);
+ }
+
+ private function handleDateChange() : void {
+ alert('Date selected: ' + $scope["myDate"].toString());
+ }
+
+ public function handleBtnClick(event:Event):void
+ {
+ $mdDialog.show(
+ {
+ scope: $scope,
+ preserveScope: true,
+ //template: '<div style="margin:25px;"><img src="http://flex.apache.org/images/logo_01_fullcolor-sm.png" alt=""/><h1 md-heading">Angular Material</h1><img src="https://material.angularjs.org/latest/img/icons/angular-logo.svg" alt=""/><div layout="row"><span flex/><md-button ng-click=close()>CLOSE</md-button></div></div>',
+ template: '<div layout="column" layout-align="left center" style="width:500px; height:500px; margin:25px;"><h3>Select a date: </h3><md-datepicker ng-model="myDate" md-placeholder="Enter date"></md-datepicker><br>Selected date: {{myDate}}<span flex/><div layout="row"><span flex/><md-button ng-click=close()>CLOSE</md-button></div></div>',
+ clickOutsideToClose: true,
+ openFrom: angular.element(document.querySelector('#myBtn')),
+ closeTo: angular.element(document.querySelector('#myBtn'))
+ });
+ }
+
+ private function close():void
+ {
+ $mdDialog.cancel();
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/components/IWebComponent.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/components/IWebComponent.as b/examples/native/AngularExample/src/components/IWebComponent.as
new file mode 100644
index 0000000..47f3cf2
--- /dev/null
+++ b/examples/native/AngularExample/src/components/IWebComponent.as
@@ -0,0 +1,9 @@
+package components {
+ /**
+ * @author omuppirala
+ */
+ public interface IWebComponent {
+
+ function setupComponent():void;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/components/WebComponent.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/components/WebComponent.as b/examples/native/AngularExample/src/components/WebComponent.as
new file mode 100644
index 0000000..bb90d73
--- /dev/null
+++ b/examples/native/AngularExample/src/components/WebComponent.as
@@ -0,0 +1,20 @@
+package components {
+ import components.IWebComponent;
+
+ /**
+ * @author omuppirala
+ */
+ public class WebComponent extends HTMLElement implements IWebComponent {
+
+ protected var sr : ShadowRoot;
+
+ public function createdCallback() : void {
+ sr = this['createShadowRoot']();
+ setupComponent();
+ }
+
+ public function setupComponent() : void {
+ //override in subclass
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/components/mdbutton/MDButton.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/components/mdbutton/MDButton.as b/examples/native/AngularExample/src/components/mdbutton/MDButton.as
new file mode 100644
index 0000000..bb1a9f6
--- /dev/null
+++ b/examples/native/AngularExample/src/components/mdbutton/MDButton.as
@@ -0,0 +1,43 @@
+package components.mdbutton {
+ import components.WebComponent;
+ /**
+ * @author omuppirala
+ */
+ public class MDButton extends WebComponent
+ {
+
+ protected var label:Text;
+ protected var iconSpan:HTMLSpanElement;
+ override public function setupComponent():void {
+ createLabel();
+ createIcon();
+ }
+
+ protected function createLabel():void
+ {
+ label = ownerDocument.createTextNode("");
+ sr.appendChild(Node(label));
+ }
+
+ public function setLabel(labelStr:String):void {
+ this.textContent = labelStr;
+ }
+
+ protected function createIcon():void
+ {
+ iconSpan = ownerDocument.createElement("span") as HTMLSpanElement;
+ iconSpan.setAttribute("class","material-icons");
+ this.appendChild(iconSpan);
+ }
+
+ public function setIcon(iconName:String):void {
+ iconSpan.textContent = iconName;
+ }
+
+ public function clickHandler(functionName:String):void
+ {
+ this.setAttribute("ng-click", functionName+"()");
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/894b5264/examples/native/AngularExample/src/components/mdbutton/MDButtonFactory.as
----------------------------------------------------------------------
diff --git a/examples/native/AngularExample/src/components/mdbutton/MDButtonFactory.as b/examples/native/AngularExample/src/components/mdbutton/MDButtonFactory.as
new file mode 100644
index 0000000..e145a48
--- /dev/null
+++ b/examples/native/AngularExample/src/components/mdbutton/MDButtonFactory.as
@@ -0,0 +1,38 @@
+package components.mdbutton {
+ public class MDButtonFactory {
+ private static var _instance : MDButtonFactory;
+ protected var elementName : String = "md-button";
+ protected var baseComponent : Object = MDButton;
+ protected var componentClass : Object;
+ protected var alreadyRegistered: Boolean = false;
+
+ public function MDButtonFactory() {
+ if (_instance) {
+ throw new Error("MDButtonFactory is a singleton. Use getInstance instead.");
+ }
+ _instance = this;
+ }
+
+ public static function getInstance() : MDButtonFactory {
+ if (!_instance) {
+ new MDButtonFactory();
+ }
+ return _instance;
+ }
+
+ protected function registerComponent() : void {
+ if(!alreadyRegistered)
+ {
+ var classProto:Object = Object["create"](components.mdbutton.MDButton['prototype']);
+ componentClass = document["registerElement"](elementName, {'prototype':classProto});
+ alreadyRegistered = true;
+ }
+ }
+
+ public function getButtonClass():Object
+ {
+ registerComponent();
+ return componentClass;
+ }
+ }
+}
[19/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Merge branch 'develop' into e4x
Posted by cd...@apache.org.
Merge branch 'develop' into e4x
* develop: (41 commits)
Application was not adding its own beads to its strand.
switch nightly to 0.7.0
try to fix 'all' target
Add AngularJS + Angular Material example. Need to figure out what to do about the externs swc files.
remove GCL crypt folder (and upgrade Selenium)
fix gpg check for docs in approval script
update rat in releasecandidate.xml
fix issues with release packaging, installation and approval
missing brace
don't exclude this anymore
AntOnAIR doesn't have flattenmapper so try alternative
fix files in LICENSE
try to make the designmodo fonts an optional dependency
switch to newer rat from maven
get ant examples to build from an IDE-compatible folder structure
fix up ant scripts to hanlde both repo folder structure and binary package folder structure
Use airglobal.swc from PROJECT_FRAMEWORKS}/libs/air/ instead of adding a reference to AIR SDK.
Update Flash Builder/Eclipse project to add reference to Graphics project.
Add dependency on AIR SDK. Need to add a linked resource called AIR_HOME in Flash Builder/Eclipse and point it to directory where AIR SDK is available.
Clean up asdoc issue surrounding the inclusion of Google Maps stubs.
...
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e2c462a0
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e2c462a0
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e2c462a0
Branch: refs/heads/feature/maven-migration
Commit: e2c462a078ad3d04e1106fd75e50bf10c8b33e24
Parents: 51bbbac 64c699d
Author: Harbs <ha...@in-tools.com>
Authored: Fri Apr 8 14:18:50 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Fri Apr 8 14:18:50 2016 +0300
----------------------------------------------------------------------
ApproveFlexJS.xml | 287 ++++++++++++++++++-
LICENSE | 7 +-
LICENSE.base | 203 +++++++++++++
LICENSE.bin | 4 -
NOTICE | 2 +-
RELEASE_NOTES | 10 +
apache-flex-flexjs-installer-config.xml | 29 ++
build.properties | 2 +-
build.xml | 54 ++--
examples/build.xml | 4 +
examples/build_example.xml | 18 ++
examples/flexjs/ChartExample/build.xml | 16 ++
examples/flexjs/DataGridExample/build.xml | 16 ++
.../src/productsView/ProductListItem.mxml | 10 +
examples/flexjs/FlexJSStore_jquery/build.xml | 16 ++
.../src/productsView/CatalogTitleButtons.mxml | 8 +-
.../productsView/ProductCatalogThumbnail.mxml | 2 +-
.../src/productsView/ProductListItem.mxml | 10 +
examples/flexjs/MapSearch/build.xml | 16 ++
examples/flexjs/MobileTrader/build.xml | 16 ++
examples/flexjs/StorageExample/README.txt | 81 ++++++
.../StorageExample/StorageExample-app.xml | 252 ++++++++++++++++
examples/flexjs/StorageExample/build.xml | 93 ++++++
examples/flexjs/StorageExample/pom.xml | 50 ++++
.../StorageExample/src/MyInitialView.mxml | 245 ++++++++++++++++
.../StorageExample/src/StorageExample.mxml | 42 +++
.../flexjs/StorageExample/src/models/MyModel.as | 58 ++++
examples/flexjs/TreeExample/build.xml | 60 ++++
examples/flexjs/TreeExample/pom.xml | 50 ++++
.../flexjs/TreeExample/src/MyInitialView.mxml | 37 +++
.../flexjs/TreeExample/src/TreeExample.mxml | 36 +++
.../flexjs/TreeExample/src/models/MyModel.as | 72 +++++
.../AngularExample/AngularExample-debug.html | 28 ++
.../AngularExample/AngularExample-release.html | 29 ++
.../native/AngularExample/src/AngularExample.as | 66 +++++
.../native/AngularExample/src/MyController.as | 52 ++++
.../src/components/IWebComponent.as | 9 +
.../src/components/WebComponent.as | 20 ++
.../src/components/mdbutton/MDButton.as | 43 +++
.../src/components/mdbutton/MDButtonFactory.as | 38 +++
frameworks/asdoc-config.xml | 3 +-
frameworks/build.xml | 6 +
frameworks/downloads.xml | 41 ++-
frameworks/projects/Binding/build.xml | 7 +
frameworks/projects/Charts/build.xml | 7 +
frameworks/projects/Collections/build.xml | 7 +
.../src/main/flex/CollectionsClasses.as | 2 +
.../org/apache/flex/collections/ArrayList.as | 114 ++++----
.../apache/flex/collections/FlattenedList.as | 203 +++++++++++++
.../apache/flex/collections/HierarchicalData.as | 269 +++++++++++++++++
.../org/apache/flex/collections/IArrayList.as | 178 ++++++++++++
.../flex/collections/IHierarchicalData.as | 119 ++++++++
.../src/main/resources/basic-manifest.xml | 1 +
frameworks/projects/Core/build.xml | 7 +
.../projects/Core/src/main/flex/CoreClasses.as | 4 +
.../projects/Core/src/main/flex/Namespace.as | 50 ++++
frameworks/projects/Core/src/main/flex/QName.as | 53 ++++
.../flex/org/apache/flex/core/Application.as | 7 +-
.../org/apache/flex/core/HTMLElementWrapper.as | 18 ++
.../flex/org/apache/flex/core/IFlexJSElement.as | 18 ++
.../flex/org/apache/flex/core/IItemRenderer.as | 12 +
.../org/apache/flex/core/WrappedHTMLElement.as | 18 ++
.../flex/org/apache/flex/events/CustomEvent.as | 9 +-
.../main/flex/org/apache/flex/events/Event.as | 17 +-
.../org/apache/flex/events/EventDispatcher.as | 14 +
.../flex/org/apache/flex/events/MouseEvent.as | 2 +-
.../org/apache/flex/events/ValueChangeEvent.as | 9 +-
.../flex/org/apache/flex/events/ValueEvent.as | 10 +-
.../main/flex/org/apache/flex/utils/Proxy.as | 152 ++++++++++
frameworks/projects/CreateJS/build.xml | 11 +-
frameworks/projects/DragDrop/build.xml | 7 +
frameworks/projects/Effects/build.xml | 7 +
frameworks/projects/Flat/build.xml | 7 +
frameworks/projects/Formatters/build.xml | 6 +
frameworks/projects/GoogleMaps/build.xml | 11 +-
.../src/main/flex/google/maps/Animation.as | 18 ++
.../src/main/flex/google/maps/BicyclingLayer.as | 18 ++
.../src/main/flex/google/maps/Circle.as | 18 ++
.../main/flex/google/maps/ControlPosition.as | 18 ++
.../main/flex/google/maps/DirectionsRenderer.as | 18 ++
.../main/flex/google/maps/DirectionsService.as | 18 ++
.../main/flex/google/maps/DirectionsStatus.as | 18 ++
.../google/maps/DistanceMatrixElementStatus.as | 18 ++
.../flex/google/maps/DistanceMatrixService.as | 18 ++
.../flex/google/maps/DistanceMatrixStatus.as | 18 ++
.../main/flex/google/maps/ElevationService.as | 18 ++
.../main/flex/google/maps/ElevationStatus.as | 18 ++
.../flex/google/maps/FusionTablesHeatmap.as | 18 ++
.../main/flex/google/maps/FusionTablesLayer.as | 18 ++
.../google/maps/FusionTablesMarkerOptions.as | 18 ++
.../google/maps/FusionTablesPolygonOptions.as | 18 ++
.../google/maps/FusionTablesPolylineOptions.as | 18 ++
.../main/flex/google/maps/FusionTablesQuery.as | 18 ++
.../main/flex/google/maps/FusionTablesStyle.as | 18 ++
.../src/main/flex/google/maps/Geocoder.as | 18 ++
.../google/maps/GeocoderAddressComponent.as | 18 ++
.../main/flex/google/maps/GeocoderGeometry.as | 18 ++
.../flex/google/maps/GeocoderLocationType.as | 18 ++
.../src/main/flex/google/maps/GeocoderResult.as | 18 ++
.../src/main/flex/google/maps/GeocoderStatus.as | 18 ++
.../src/main/flex/google/maps/GroundOverlay.as | 18 ++
.../src/main/flex/google/maps/ImageMapType.as | 18 ++
.../src/main/flex/google/maps/InfoWindow.as | 18 ++
.../src/main/flex/google/maps/KmlAuthor.as | 18 ++
.../src/main/flex/google/maps/KmlFeatureData.as | 18 ++
.../src/main/flex/google/maps/KmlLayer.as | 18 ++
.../main/flex/google/maps/KmlLayerMetadata.as | 18 ++
.../src/main/flex/google/maps/KmlLayerStatus.as | 18 ++
.../src/main/flex/google/maps/KmlMouseEvent.as | 18 ++
.../src/main/flex/google/maps/LatLng.as | 37 +--
.../src/main/flex/google/maps/LatLngBounds.as | 18 ++
.../src/main/flex/google/maps/MVCArray.as | 18 ++
.../src/main/flex/google/maps/MVCObject.as | 19 ++
.../GoogleMaps/src/main/flex/google/maps/Map.as | 18 ++
.../flex/google/maps/MapCanvasProjection.as | 18 ++
.../src/main/flex/google/maps/MapPanes.as | 18 ++
.../flex/google/maps/MapTypeControlStyle.as | 18 ++
.../src/main/flex/google/maps/MapTypeId.as | 18 ++
.../main/flex/google/maps/MapTypeRegistry.as | 18 ++
.../main/flex/google/maps/MapsEventListener.as | 18 ++
.../src/main/flex/google/maps/Marker.as | 37 +--
.../src/main/flex/google/maps/MaxZoomService.as | 18 ++
.../src/main/flex/google/maps/MaxZoomStatus.as | 18 ++
.../src/main/flex/google/maps/MouseEvent.as | 19 ++
.../src/main/flex/google/maps/OverlayView.as | 18 ++
.../src/main/flex/google/maps/Point.as | 18 ++
.../src/main/flex/google/maps/PolyMouseEvent.as | 18 ++
.../src/main/flex/google/maps/Polygon.as | 18 ++
.../src/main/flex/google/maps/Polyline.as | 18 ++
.../src/main/flex/google/maps/Rectangle.as | 18 ++
.../main/flex/google/maps/ScaleControlStyle.as | 18 ++
.../src/main/flex/google/maps/Size.as | 18 ++
.../flex/google/maps/StreetViewCoverageLayer.as | 18 ++
.../main/flex/google/maps/StreetViewPanorama.as | 18 ++
.../src/main/flex/google/maps/StreetViewPov.as | 18 ++
.../main/flex/google/maps/StreetViewService.as | 18 ++
.../main/flex/google/maps/StreetViewStatus.as | 18 ++
.../src/main/flex/google/maps/StrokePosition.as | 18 ++
.../src/main/flex/google/maps/StyledMapType.as | 18 ++
.../src/main/flex/google/maps/SymbolPath.as | 18 ++
.../src/main/flex/google/maps/TrafficLayer.as | 18 ++
.../src/main/flex/google/maps/TransitLayer.as | 18 ++
.../src/main/flex/google/maps/TravelMode.as | 18 ++
.../src/main/flex/google/maps/UnitSystem.as | 18 ++
.../main/flex/google/maps/ZoomControlStyle.as | 18 ++
.../src/main/flex/google/maps/adsense.as | 18 ++
.../main/flex/google/maps/adsense/AdFormat.as | 18 ++
.../src/main/flex/google/maps/adsense/AdUnit.as | 18 ++
.../src/main/flex/google/maps/drawing.as | 18 ++
.../flex/google/maps/drawing/DrawingManager.as | 18 ++
.../google/maps/drawing/OverlayCompleteEvent.as | 18 ++
.../flex/google/maps/drawing/OverlayType.as | 18 ++
.../src/main/flex/google/maps/event.as | 18 ++
.../src/main/flex/google/maps/geometry.as | 18 ++
.../main/flex/google/maps/geometry/encoding.as | 18 ++
.../src/main/flex/google/maps/geometry/poly.as | 18 ++
.../main/flex/google/maps/geometry/spherical.as | 18 ++
.../src/main/flex/google/maps/panoramio.as | 18 ++
.../google/maps/panoramio/PanoramioLayer.as | 18 ++
.../src/main/flex/google/maps/places.as | 18 ++
.../flex/google/maps/places/Autocomplete.as | 18 ++
.../google/maps/places/AutocompleteService.as | 18 ++
.../google/maps/places/ComponentRestrictions.as | 18 ++
.../flex/google/maps/places/PhotoOptions.as | 18 ++
.../google/maps/places/PlaceAspectRating.as | 18 ++
.../flex/google/maps/places/PlaceGeometry.as | 18 ++
.../main/flex/google/maps/places/PlaceResult.as | 18 ++
.../main/flex/google/maps/places/PlaceReview.as | 18 ++
.../google/maps/places/PlaceSearchPagination.as | 18 ++
.../flex/google/maps/places/PlacesService.as | 18 ++
.../google/maps/places/PlacesServiceStatus.as | 18 ++
.../src/main/flex/google/maps/places/RankBy.as | 18 ++
.../main/flex/google/maps/places/SearchBox.as | 18 ++
.../src/main/flex/google/maps/visualization.as | 18 ++
.../maps/visualization/DemographicsLayer.as | 18 ++
.../google/maps/visualization/HeatmapLayer.as | 18 ++
.../maps/visualization/MapsEngineLayer.as | 18 ++
.../maps/visualization/MapsEngineStatus.as | 18 ++
.../src/main/flex/google/maps/weather.as | 18 ++
.../main/flex/google/maps/weather/CloudLayer.as | 18 ++
.../main/flex/google/maps/weather/LabelColor.as | 18 ++
.../flex/google/maps/weather/TemperatureUnit.as | 18 ++
.../flex/google/maps/weather/WeatherLayer.as | 18 ++
.../flex/google/maps/weather/WindSpeedUnit.as | 18 ++
.../main/flex/google/pseudo/HTMLInputElement.as | 20 ++
.../src/main/flex/google/pseudo/Node.as | 20 ++
frameworks/projects/Graphics/build.xml | 6 +
.../projects/HTML/.actionScriptProperties | 1 +
frameworks/projects/HTML/build.xml | 6 +
.../projects/HTML/src/main/flex/HTMLClasses.as | 8 +-
.../src/main/flex/org/apache/flex/html/Tree.as | 73 +++++
.../DataItemRendererFactoryForArrayList.as | 27 +-
...ataItemRendererFactoryForHierarchicalData.as | 109 +++++++
.../ListSingleSelectionMouseController.as | 10 +-
.../TreeSingleSelectionMouseController.as | 82 ++++++
.../beads/models/ArrayListSelectionModel.as | 64 ++---
.../html/supportClasses/GraphicsItemRenderer.as | 21 ++
.../html/supportClasses/StringItemRenderer.as | 3 -
.../supportClasses/TextFieldItemRenderer.as | 19 ++
.../html/supportClasses/TreeItemRenderer.as | 64 +++++
.../flex/html/supportClasses/TreeListData.as | 76 +++++
.../html/supportClasses/UIItemRendererBase.as | 21 ++
.../HTML/src/main/resources/basic-manifest.xml | 2 +
.../HTML/src/main/resources/defaults.css | 22 ++
frameworks/projects/HTML5/build.xml | 6 +
frameworks/projects/JQuery/build.xml | 11 +-
.../projects/Mobile/.actionScriptProperties | 1 +
frameworks/projects/Mobile/build.xml | 6 +
.../Mobile/src/main/flex/MobileClasses.as | 3 +
.../flex/org/apache/flex/mobile/ToggleSwitch.as | 105 +++++++
.../flex/mobile/beads/ToggleSwitchView.as | 180 ++++++++++++
.../controllers/ToggleSwitchMouseController.as | 120 ++++++++
.../src/main/resources/basic-manifest.xml | 1 +
.../Mobile/src/main/resources/defaults.css | 9 +
frameworks/projects/Network/build.xml | 6 +
frameworks/projects/Reflection/build.xml | 6 +
frameworks/projects/Storage/build.xml | 184 ++++++++++++
.../Storage/src/main/flex/StorageClasses.as | 46 +++
.../apache/flex/storage/IPermanentStorage.as | 91 ++++++
.../flex/org/apache/flex/storage/IWebStorage.as | 100 +++++++
.../org/apache/flex/storage/LocalStorage.as | 157 ++++++++++
.../org/apache/flex/storage/PermanentStorage.as | 131 +++++++++
.../flex/storage/events/FileErrorEvent.as | 80 ++++++
.../org/apache/flex/storage/events/FileEvent.as | 84 ++++++
.../apache/flex/storage/file/DataInputStream.as | 146 ++++++++++
.../flex/storage/file/DataOutputStream.as | 165 +++++++++++
.../org/apache/flex/storage/file/IDataInput.as | 32 +++
.../org/apache/flex/storage/file/IDataOutput.as | 32 +++
.../org/apache/flex/storage/file/IDataStream.as | 32 +++
.../org/apache/flex/storage/file/LocalFile.as | 84 ++++++
.../storage/providers/AirStorageProvider.as | 255 ++++++++++++++++
.../providers/IPermanentStorageProvider.as | 102 +++++++
.../storage/providers/LocalStorageProvider.as | 220 ++++++++++++++
.../storage/providers/WebStorageProvider.as | 255 ++++++++++++++++
.../src/main/resources/basic-manifest.xml | 25 ++
.../src/main/resources/compile-asjs-config.xml | 82 ++++++
.../src/main/resources/compile-config.xml | 82 ++++++
.../Storage/src/main/resources/defaults.css | 42 +++
installer.properties/en_US.properties | 14 +
installer.xml | 84 +++++-
manualtests/LanguageTests/src/LanguageTests.as | 26 +-
manualtests/ProxyTest/build.xml | 72 +++++
manualtests/ProxyTest/src/MyInitialView.mxml | 67 +++++
manualtests/ProxyTest/src/ProxyTest.mxml | 40 +++
manualtests/ProxyTest/src/README.txt | 45 +++
.../ProxyTest/src/controllers/MyController.as | 52 ++++
manualtests/ProxyTest/src/models/MyModel.as | 125 ++++++++
marmotinni/java/downloads.xml | 6 +-
nightly.properties | 8 +-
releasecandidate.xml | 9 +-
250 files changed, 9326 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
[32/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- XMLLIst needed name() for single item lists
Posted by cd...@apache.org.
XMLLIst needed name() for single item lists
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d4dc652c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d4dc652c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d4dc652c
Branch: refs/heads/feature/maven-migration
Commit: d4dc652c9231ba1707a619b60e8fd891f3d728a2
Parents: 60670ec
Author: Harbs <ha...@in-tools.com>
Authored: Mon Apr 11 13:36:20 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Mon Apr 11 13:36:20 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/XMLList.as | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d4dc652c/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index cb38a4b..d507033 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -437,6 +437,13 @@ package
return _xmlArray.length;
}
+ COMPILE::JS
+ public function name():QName
+ {
+ if(_xmlArray.length == 1)
+ return _xmlArray[0].name();
+ return null;
+ }
/**
* Merges adjacent text nodes and eliminates empty text nodes for each of the following:
* all text nodes in the XMLList, all the XML objects contained in the XMLList, and the descendants of all the XML objects in the XMLList.
[35/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- Added XML tests (needs more work)
Posted by cd...@apache.org.
Added XML tests (needs more work)
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/777436c2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/777436c2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/777436c2
Branch: refs/heads/feature/maven-migration
Commit: 777436c24dd36d2be3bf9efd18ec9d23c63f94a5
Parents: fdbc359
Author: Harbs <ha...@in-tools.com>
Authored: Tue Apr 12 00:16:24 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Tue Apr 12 00:16:24 2016 +0300
----------------------------------------------------------------------
manualtests/XMLTest/src/MyInitialView.mxml | 131 +++++++++++++++++++++++-
1 file changed, 127 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/777436c2/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index cf9f677..83de865 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -33,13 +33,58 @@ limitations under the License.
<fx:Script>
<![CDATA[
- import org.apache.flex.core.IPopUpHost;
- import org.apache.flex.events.Event;
- import org.apache.flex.utils.UIUtils;
import XML;
- [Event(name="foo", type="org.apache.flex.events.Event")]
+ private var xmlStr:String = '<?xml version="1.0" encoding="UTF-8" ?>'+
+ '<catalog xmlns:fx="http://ns.adobe.com/mxml/2009"'+
+ ' xmlns:dac="com.printui.view.components.DesignAreaComponents.*">'+
+ '<'+'!'+'-'+'- just a comment -'+'-'+'>'+
+ '<?bla fud?>'+
+ ' bla bla<product description="Cardigan Sweater" product_image="cardigan.jpg">'+
+ ' <fx:catalog_item gender="Men\'s" fx:foo="bah">'+
+ ' <item_number>QWZ5671</item_number>'+
+ ' <price>39.95</price>'+
+ ' <size description="Medium">'+
+ ' <color_swatch image="red_cardigan.jpg">Red</color_swatch>'+
+ ' <color_swatch image="burgundy_cardigan.jpg">Burgundy</color_swatch>'+
+ ' </size>'+
+ ' <size description="Large">'+
+ ' <color_swatch image="red_cardigan.jpg">Red</color_swatch>'+
+ ' <color_swatch image="burgundy_cardigan.jpg">Burgundy</color_swatch>'+
+ ' </size>'+
+ ' </fx:catalog_item>'+
+ ' <script> <![CDATA[private function onStylesLoaded(ev:Event):void {currentState = "normal";facade = ApplicationFacade.getInstance();facade.notifyObservers(new Notification(ApplicationFacade.CMD_STARTUP, this));} ]'+']> </script>'+
+' <catalog_item gender="Women\'s">'+
+ ' <item_number>RRX9856</item_number>'+
+ ' <price>42.50</price>'+
+ ' <size description="Small">'+
+ ' <color_swatch image="red_cardigan.jpg">Red</color_swatch>'+
+ ' <color_swatch image="navy_cardigan.jpg">Navy</color_swatch>'+
+ ' <color_swatch image="burgundy_cardigan.jpg">Burgundy</color_swatch>'+
+ ' </size>'+
+ ' <size description="Medium">'+
+ ' <color_swatch image="red_cardigan.jpg">Red</color_swatch>'+
+ ' <color_swatch image="navy_cardigan.jpg">Navy</color_swatch>'+
+ ' <color_swatch image="burgundy_cardigan.jpg">Burgundy</color_swatch>'+
+ ' <color_swatch image="black_cardigan.jpg">Black</color_swatch>'+
+ ' </size>'+
+ ' <size description="Large">'+
+ ' <color_swatch image="navy_cardigan.jpg">Navy</color_swatch>'+
+ ' <color_swatch image="black_cardigan.jpg">Black</color_swatch>'+
+ ' </size>'+
+ ' <size description="Extra Large">'+
+ ' <color_swatch image="burgundy_cardigan.jpg">Burgundy</color_swatch>'+
+ ' <color_swatch image="black_cardigan.jpg">Black</color_swatch>'+
+ ' </size>'+
+ ' </catalog_item>'+
+ ' </product>'+
+'</catalog>';
+
+ private var xml:XML = new XML(xmlStr);
+ private var text:String = "hi";
+ private var xml2:XML = new XML('<root xmlns:fz="http://ns.adobe.com/mxml/2009"><a><b/></a><a name="fred"/><a>hi<b>yeah!</b></a><a name="frank"/><c/></root>');
+
public function runTest():void
{
var args:Array;
@@ -63,6 +108,84 @@ limitations under the License.
pop[0] = <pop><child name="Fred"/></pop>;
trace(pop.toString());
trace(xml1.toString());
+
+
+var xmlString:String = xml.toXMLString();
+var script:XML = xml..script[0].children()[0];
+var kind = script.nodeKind();
+var comment = xml.children()[0];
+var comKind = comment.nodeKind();
+var instr = xml.processingInstructions()[0];
+var prod = xml.product[0];
+//JIRA https://issues.apache.org/jira/browse/FLEX-35069
+//var catalog_item = xml..('http://ns.adobe.com/mxml/2009')::catalog_item[0];
+var prod_desc_name = prod.@description.name();
+//xml2.appendChild(catalog_item);
+trace(prod.childIndex());
+ var list1:XMLList = xml2.a;
+ var aaa = list1[0];
+ var aab = list1[0][0][0];
+ var list2:XMLList = xml2.child("a");
+ var list3:XMLList = xml2.descendants();
+ list3 = list3.(attribute("name").length());
+ list2[list2.length()] = <c id="1"/>;
+ list2[0] = <bla/>;
+ var list4:XMLList = new XMLList();
+ list4[0] = <a id="1"/>;
+ list4[1] = <a id="2"/>;
+ list4[2] = <a id="3"/>;
+//JIRA https://issues.apache.org/jira/browse/FLEX-35072
+// list1 += list4
+list1.concat(list4);
+ xml2.insertChildAfter(xml2.a,<a id="123"/>);
+ xml2.a = list4;
+ xml2.a = <a id="123"/>;
+ xml2.a += <a id="456"/>;
+ //xml2.a -= <a id="456"/>;
+ var a = xml2.baz
+ trace(xml2.toString());
+ trace(xml2.toXMLString());
+ trace(list1[0].toString());
+ trace(list1[0].toXMLString());
+ trace(list1[1].toString());
+ trace(list1[1].toXMLString());
+ trace(list1[2].toString());
+ trace(list1[2].toXMLString());
+ trace(list1[3].toString());
+ trace(list1[3].toXMLString());
+ var aaa = list1[4];
+ trace(list1[4].toString());
+ trace(list1[4].toXMLString());
+ trace(list1[5].toString());
+ trace(list1[5].toXMLString());
+
+ delete xml2.a;
+ var aa:XMLList = list2.b;
+ var ab:XMLList = list2.@name;
+ var ac = ab.parent();
+ trace(list2.length());
+ var list3:XMLList = list1.copy();
+ //list1[0].@foo = "food";
+ trace(list1[1].contains(<a name="fred"/>));
+ trace("simple: " +list1[0].hasSimpleContent());
+ trace("complex: " +list1[0].hasComplexContent());
+ trace("simple: " +list1[1].hasSimpleContent());
+ trace("complex: " +list1[1].hasComplexContent());
+ trace("simple: " +list1[2].hasSimpleContent());
+ trace("complex: " +list1[2].hasComplexContent());
+ trace("simple: " +list1.hasSimpleContent());
+ trace("complex: " +list1.hasComplexContent());
+ var list2:XMLList = xml2.b;
+ trace("list 2");
+ trace("simple: " +list2.hasSimpleContent());
+ trace("complex: " +list2.hasComplexContent());
+ var elem:XMLList = list1.elements();
+ var elem2:XMLList = list1.elements("c");
+ var elem3:XMLList = list1.elements("a");
+ trace(list1.toXMLString());
+ trace(list1.toString());
+ trace("done");
+
}
]]>
</fx:Script>
[23/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- First working E4X test
Posted by cd...@apache.org.
First working E4X test
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5d2d0dd4
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5d2d0dd4
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5d2d0dd4
Branch: refs/heads/feature/maven-migration
Commit: 5d2d0dd43410072734f7ae164f1a487260d471ad
Parents: ff4cf69
Author: Harbs <ha...@in-tools.com>
Authored: Sun Apr 10 15:53:07 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Apr 10 15:53:07 2016 +0300
----------------------------------------------------------------------
frameworks/projects/XML/src/main/flex/QName.as | 8 ++++---
frameworks/projects/XML/src/main/flex/XML.as | 23 ++++++++++++++-------
manualtests/XMLTest/src/MyInitialView.mxml | 5 +++--
3 files changed, 23 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5d2d0dd4/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index bfd7b40..c6886aa 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -57,11 +57,13 @@ package
if(localNameVal)
_localName = localNameVal.toString();
}
+ else if(localNameVal)
+ {
+ _localName = localNameVal;
+ }
else if (qNameOrUri && qNameOrUri.toString())
{
- _uri = qNameOrUri.toString();
- if(localNameVal)
- _localName = localNameVal;
+ _localName = qNameOrUri.toString();
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5d2d0dd4/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 86a3ed1..b2222b6 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -329,6 +329,10 @@ package
var node:Element = doc.childNodes[0];
_version = doc.xmlVersion;
_encoding = doc.xmlEncoding;
+ _name = new QName();
+ _name.prefix = node.prefix;
+ _name.uri = node.namespaceURI;
+ _name.localName = node.localName;
iterateElement(node,this);
normalize();
}
@@ -2257,16 +2261,19 @@ package
//attributes and namespace declarations... (15-16)
for(i=0;i<declarations.length;i++)
{
- strArr.push(" xmlns");
- if(declarations[i].prefix)
+ var decVal:String = escapeAttributeValue(declarations[i].uri);
+ if(decVal)
{
- strArr.push(":");
- strArr.push(declarations[i].prefix);
+ strArr.push(" xmlns");
+ if(declarations[i].prefix)
+ {
+ strArr.push(":");
+ strArr.push(declarations[i].prefix);
+ }
+ strArr.push('="');
+ strArr.push(decVal);
+ strArr.push('"');
}
- strArr.push('="');
- strArr.push(escapeAttributeValue(declarations[i].uri));
- strArr.push('"');
-
}
for(i=0;i<_attributes.length;i++)
{
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5d2d0dd4/manualtests/XMLTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/XMLTest/src/MyInitialView.mxml b/manualtests/XMLTest/src/MyInitialView.mxml
index c611565..8d2fff5 100644
--- a/manualtests/XMLTest/src/MyInitialView.mxml
+++ b/manualtests/XMLTest/src/MyInitialView.mxml
@@ -46,8 +46,9 @@ limitations under the License.
var j:int;
var m:int;
var xml1:XML = <foo baz="true"/>;
- trace(xml1);
- trace(xml1.baz);
+ trace(xml1.toXMLString());
+ var baz:XMLList = xml1.@baz;
+ trace(xml1.@baz.toString());
}
]]>