You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/13 06:00:17 UTC
[01/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - Panel
should use Basic to stretch the child, and have a white background
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 59f231d2d -> a03fb4f6e
Panel should use Basic to stretch the child, and have a white background
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4871d1e8
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4871d1e8
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4871d1e8
Branch: refs/heads/release0.8.0
Commit: 4871d1e8e83a4e4b33c66c0342656c0ec318204d
Parents: 59f231d
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 19:36:29 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:57 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/productsView/ProductCatalogPanel.mxml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4871d1e8/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogPanel.mxml b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogPanel.mxml
index 3e04263..5fc7373 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogPanel.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogPanel.mxml
@@ -505,7 +505,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
- <js:VerticalLayout />
+ <js:BasicLayout />
<js:DragMouseController id="dragger" />
<js:ParentDocumentBead id="pdb" />
<js:PanelView>
@@ -521,7 +521,7 @@ limitations under the License.
</js:titleBar>
</js:PanelView>
</js:beads>
- <js:Container width="100%" height="100%">
+ <js:Container width="100%" height="100%" style="backgroundColor: #ffffff">
<js:Container id="thumbContentGroup" width="100%" height="100%">
<js:beads>
<js:ScrollingViewport id="scv" />
[10/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - Tooltip
needs className and absolute positioning
Posted by ah...@apache.org.
Tooltip needs className and absolute positioning
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b8b0a27d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b8b0a27d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b8b0a27d
Branch: refs/heads/release0.8.0
Commit: b8b0a27d2547945b202c8073b4b00481e0fa3595
Parents: ec07742
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 21:23:24 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/org/apache/flex/html/ToolTip.as | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8b0a27d/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
index 4093b09..24cfd24 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
@@ -23,6 +23,10 @@ package org.apache.flex.html
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
+ COMPILE::JS
+ {
+ import org.apache.flex.core.WrappedHTMLElement;
+ }
/*
* Label probably should extend TextField directly,
@@ -54,7 +58,18 @@ package org.apache.flex.html
public function ToolTip()
{
super();
+ className = "ToolTip";
}
+ /**
+ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ var e:WrappedHTMLElement = super.createElement();
+ positioner.style.position = 'absolute';
+ return e;
+ }
}
}
[05/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - this
should be a vertical list of keywords
Posted by ah...@apache.org.
this should be a vertical list of keywords
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0316364e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0316364e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0316364e
Branch: refs/heads/release0.8.0
Commit: 0316364e3c4e135adae30d829caddc34c3eebb6d
Parents: 4871d1e
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 19:37:28 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/productsView/ProductCatalogThumbnail.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0316364e/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
index e869a0b..bff7e18 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
@@ -156,7 +156,7 @@ limitations under the License.
<js:style>
<js:SimpleCSSStyles paddingTop="0" right="0" /> <!-- gap="0" -->
</js:style>
- <js:Label text="{product.featureString}" width="60" height="48" />
+ <js:MultilineLabel text="{product.featureString}" width="60" height="48" />
<js:Label text="{cf.format(product.price)}" style="fontWeight:bold"/>
<js:Spacer height="4"/>
<js:Label text="{product.highlight1}" style="color:#EE8D0C" includeIn="x3cols, x2cols"/>
[12/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - panel
needs to apply layout to custom titlebars as well
Posted by ah...@apache.org.
panel needs to apply layout to custom titlebars as well
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8785ca0b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8785ca0b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8785ca0b
Branch: refs/heads/release0.8.0
Commit: 8785ca0b7da691edca56a2a995bf7d8b397e7ec7
Parents: 7f65283
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:45:06 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:59 2017 -0700
----------------------------------------------------------------------
.../org/apache/flex/html/beads/PanelView.as | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8785ca0b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
index 43af3f8..167e26a 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
@@ -135,23 +135,25 @@ package org.apache.flex.html.beads
if (!_titleBar) {
_titleBar = new TitleBar();
- _titleBar.id = "panelTitleBar";
+ }
+
+ _titleBar.id = "panelTitleBar";
- COMPILE::SWF {
- _titleBar.percentWidth = 100;
+ COMPILE::SWF {
+ _titleBar.percentWidth = 100;
- if (_titleBar.style == null) {
- _titleBar.style = new SimpleCSSStyles();
- }
- _titleBar.style.flexGrow = 0;
- _titleBar.style.order = 1;
+ if (_titleBar.style == null) {
+ _titleBar.style = new SimpleCSSStyles();
}
+ _titleBar.style.flexGrow = 0;
+ _titleBar.style.order = 1;
+ }
- COMPILE::JS {
- _titleBar.element.style["flex-grow"] = "0";
- _titleBar.element.style["order"] = "1";
- }
+ COMPILE::JS {
+ _titleBar.element.style["flex-grow"] = "0";
+ _titleBar.element.style["order"] = "1";
}
+
// replace the TitleBar's model with the Panel's model (it implements ITitleBarModel) so that
// any changes to values in the Panel's model that correspond values in the TitleBar will
// be picked up automatically by the TitleBar.
[11/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - need to
run layout on visibility change because initial layout skips invisible
objects
Posted by ah...@apache.org.
need to run layout on visibility change because initial layout skips invisible objects
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a03fb4f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a03fb4f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a03fb4f6
Branch: refs/heads/release0.8.0
Commit: a03fb4f6e184fd4d05235b10ad26e337971acebf
Parents: 8785ca0
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:46:50 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:59 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/productsView/ProductCatalogThumbnail.mxml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a03fb4f6/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
index 5f2c7c2..c339f5d 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
@@ -35,6 +35,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
<js:LayoutChangeNotifier watchedProperty="{borderStyles.borderColor}" initialValue="#FFFFFF" />
+ <js:LayoutChangeNotifier watchedProperty="{buttons.visible}" initialValue="false" />
<js:StyleChangeNotifier />
</js:beads>
<js:style>
[02/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - update
build script for dual
Posted by ah...@apache.org.
update build script for dual
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7f652838
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7f652838
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7f652838
Branch: refs/heads/release0.8.0
Commit: 7f65283854dd0eb887266684aac69a6e0169b8a9
Parents: 4532aac
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:43:27 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
manualtests/build_example.xml | 305 +++++++++++++++++++------------------
1 file changed, 159 insertions(+), 146 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7f652838/manualtests/build_example.xml
----------------------------------------------------------------------
diff --git a/manualtests/build_example.xml b/manualtests/build_example.xml
index 0001365..918562c 100644
--- a/manualtests/build_example.xml
+++ b/manualtests/build_example.xml
@@ -1,42 +1,43 @@
<?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.
-
--->
+
+ 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="build_example" basedir=".">
-
+
<path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ <fileset dir="${FALCONJX_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
<target name="compile" description="Compiles ${example}">
<echo message="Compiling ${example}.swf"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
-
+ <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<!-- this is a dummy var placeholder in case some example needs to define a theme
- then they would set theme_arg=-theme=<path to theme> -->
- <property name="theme_arg" value="-define=CONFIG::theme,false" />
+ then they would set theme_arg=-theme=<path to theme> -->
+ <property name="theme_arg" value="-define+=CONFIG::theme,false" />
<mxmlc fork="true"
- file="${basedir}/src/${example}.mxml"
- output="${basedir}/bin-debug/${example}.swf">
+ file="${basedir}/src/${example}.mxml"
+ output="${basedir}/bin-debug/${example}.swf">
<jvmarg line="${mxmlc.jvm.args}"/>
<arg value="+flexlib=${basedir}/frameworks" />
<arg value="-debug" />
@@ -50,18 +51,19 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
</mxmlc>
- <html-wrapper
- height="100%"
- width="100%"
- bgcolor="#ffffff"
- name="${example}"
- versionmajor="11"
- versionminor="1"
- versionrevision="0"
- output="${basedir}/bin-debug"/>
-
+ <html-wrapper
+ height="100%"
+ width="100%"
+ bgcolor="#ffffff"
+ name="${example}"
+ versionmajor="11"
+ versionminor="1"
+ versionrevision="0"
+ output="${basedir}/bin-debug"/>
+
<copy todir="${basedir}/bin-debug">
<fileset dir="${basedir}/src">
<include name="**/*.png" />
@@ -102,6 +104,7 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
</mxmlc>
<copy todir="${basedir}/bin-debug">
@@ -119,14 +122,14 @@
<target name="compileas" description="Compiles ${example}">
<echo message="Compiling ${example}.swf"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
-
+
<!-- Load the <compc> task. We can't do this at the <project> level -->
<!-- because targets that run before flexTasks.jar gets built would fail. -->
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<mxmlc fork="true"
- file="${basedir}/src/${example}.as"
- output="${basedir}/bin-debug/${example}.swf">
+ file="${basedir}/src/${example}.as"
+ output="${basedir}/bin-debug/${example}.swf">
<jvmarg line="${mxmlc.jvm.args}"/>
<arg value="+flexlib=${basedir}/frameworks" />
<arg value="-debug" />
@@ -142,20 +145,21 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
</mxmlc>
- <html-wrapper
- height="300"
- width="400"
- bgcolor="#ffffff"
- name="${example}"
- versionmajor="11"
- versionminor="1"
- versionrevision="0"
- output="${basedir}/bin-debug"/>
-
+ <html-wrapper
+ height="300"
+ width="400"
+ bgcolor="#ffffff"
+ name="${example}"
+ versionmajor="11"
+ versionminor="1"
+ versionrevision="0"
+ output="${basedir}/bin-debug"/>
+
</target>
-
+
<target name="compilejs" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
@@ -163,7 +167,7 @@
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<property name="extlib_arg" value="-define=CONFIG::extlib,false" />
-
+
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
@@ -180,25 +184,28 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" />
<arg value="${extlib_arg}" />
<arg value="-remove-circulars" />
+ <arg value="-define=COMPILE::SWF,false" />
+ <arg value="-define=COMPILE::JS,true" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<arg value="${basedir}/src/${example}.mxml" />
</java>
<fail>
- <condition>
- <not>
- <or>
- <equals arg1="${errorCode}" arg2="0" />
- <equals arg1="${errorCode}" arg2="2" />
- </or>
- </not>
- </condition>
- </fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
</target>
-
+
<target name="compilejsair" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
@@ -224,8 +231,11 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" />
<arg value="${extlib_arg}" />
<arg value="-remove-circulars" />
+ <arg value="-define=COMPILE::SWF,false" />
+ <arg value="-define=COMPILE::JS,true" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
@@ -242,7 +252,7 @@
</condition>
</fail>
</target>
-
+
<target name="compileasjs" description="Cross-compiles ${example}" unless="no.js">
<echo message="Compiling ${example}.js"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
@@ -250,11 +260,11 @@
<echo message="GOOG_HOME: ${GOOG_HOME}"/>
<property name="theme_arg" value="-define=CONFIG::theme,false" />
<property name="extlib_arg" value="-define=CONFIG::extlib,false" />
-
+
<java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
fork="true">
<jvmarg line="${mxmlc.jvm.args}"/>
- <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
+ <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks"/>
<arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
<arg value="-debug" />
<arg value="${theme_arg}" />
@@ -269,25 +279,28 @@
<arg value="-compiler.binding-event-handler-event=org.apache.flex.events.Event" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-external-library-path=${FLEXJS_HOME}/js/libs/js.swc" />
<arg value="${extlib_arg}" />
<arg value="-remove-circulars" />
+ <arg value="-define=COMPILE::SWF,false" />
+ <arg value="-define=COMPILE::JS,true" />
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
<arg value="${basedir}/src/${example}.as" />
</java>
<fail>
- <condition>
- <not>
- <or>
- <equals arg1="${errorCode}" arg2="0" />
- <equals arg1="${errorCode}" arg2="2" />
- </or>
- </not>
- </condition>
- </fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
</target>
-
+
<macrodef name="html-wrapper">
<attribute name="width"/>
<attribute name="height"/>
@@ -297,80 +310,80 @@
<attribute name="versionminor"/>
<attribute name="versionrevision"/>
<attribute name="output"/>
- <sequential>
- <copy toFile="@{output}/@{name}.html"
- file="${FLEXJS_HOME}/templates/swfobject/index.template.html" />
- <copy toDir="@{output}/history">
- <fileset dir="${FLEXJS_HOME}/templates/swfobject/history">
- <include name="**"/>
- </fileset>
- </copy>
- <copy toDir="@{output}">
- <fileset dir="${FLEXJS_HOME}/templates/swfobject">
- <include name="*"/>
- <exclude name="index.template.html"/>
- </fileset>
- </copy>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${title}"
- value="@{name}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${bgcolor}"
- value="@{bgcolor}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${useBrowserHistory}"
- value="--"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${version_major}"
- value="@{versionmajor}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${version_minor}"
- value="@{versionminor}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${version_revision}"
- value="@{versionrevision}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${expressInstallSwf}"
- value="expressInstall.swf"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${expressInstallSwf}"
- value="expressInstall.swf"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${width}"
- value="@{width}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${height}"
- value="@{height}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${application}"
- value="@{name}"/>
- </replace>
- <replace file="@{output}/@{name}.html">
- <replacefilter
- token="$${swf}"
- value="@{name}"/>
- </replace>
+ <sequential>
+ <copy toFile="@{output}/@{name}.html"
+ file="${FLEXJS_HOME}/templates/swfobject/index.template.html" />
+ <copy toDir="@{output}/history">
+ <fileset dir="${FLEXJS_HOME}/templates/swfobject/history">
+ <include name="**"/>
+ </fileset>
+ </copy>
+ <copy toDir="@{output}">
+ <fileset dir="${FLEXJS_HOME}/templates/swfobject">
+ <include name="*"/>
+ <exclude name="index.template.html"/>
+ </fileset>
+ </copy>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${title}"
+ value="@{name}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${bgcolor}"
+ value="@{bgcolor}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${useBrowserHistory}"
+ value="--"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${version_major}"
+ value="@{versionmajor}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${version_minor}"
+ value="@{versionminor}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${version_revision}"
+ value="@{versionrevision}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${expressInstallSwf}"
+ value="expressInstall.swf"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${expressInstallSwf}"
+ value="expressInstall.swf"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${width}"
+ value="@{width}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${height}"
+ value="@{height}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${application}"
+ value="@{name}"/>
+ </replace>
+ <replace file="@{output}/@{name}.html">
+ <replacefilter
+ token="$${swf}"
+ value="@{name}"/>
+ </replace>
</sequential>
</macrodef>
[09/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix
coercion directive
Posted by ah...@apache.org.
fix coercion directive
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e9b2c4d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e9b2c4d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e9b2c4d2
Branch: refs/heads/release0.8.0
Commit: e9b2c4d2ed5c4752ab706a2478e3a85d07a85060
Parents: 0c25702
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:10:08 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e9b2c4d2/frameworks/projects/Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as
index 41ce7e7..31ad4fa 100644
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as
+++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/StyleChangeNotifier.as
@@ -60,7 +60,7 @@ package org.apache.flex.core
/**
* @private
* @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
- * @flexjsignorecoercion UIHTMLElementWrapper
+ * @flexjsignorecoercion org.apache.flex.core.UIHTMLElementWrapper
*/
private function handleStyleChange(event:ValueChangeEvent):void
{
[07/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - get
NumericStepper to use a view and get Spinner to look good in NumericStepper
Posted by ah...@apache.org.
get NumericStepper to use a view and get Spinner to look good in NumericStepper
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ec077428
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ec077428
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ec077428
Branch: refs/heads/release0.8.0
Commit: ec07742837d8d2840edf18ee310a0ec6c2ced362
Parents: 7b04b39
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 19:39:21 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../Basic/src/main/flex/BasicClasses.as | 5 +--
.../flex/org/apache/flex/html/NumericStepper.as | 45 --------------------
.../main/flex/org/apache/flex/html/Spinner.as | 1 -
.../flex/html/beads/NumericStepperView.as | 17 +++++++-
.../org/apache/flex/html/beads/SpinnerView.as | 14 ++++--
.../Basic/src/main/resources/defaults.css | 25 ++++++++---
6 files changed, 44 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index c7655cc..c733960 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -63,10 +63,7 @@ internal class BasicClasses
import org.apache.flex.html.beads.BinaryImageLoader; BinaryImageLoader;
import org.apache.flex.html.beads.models.BinaryImageModel; BinaryImageModel;
import org.apache.flex.html.beads.ListView; ListView;
- COMPILE::SWF
- {
- import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
- }
+ import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
import org.apache.flex.html.beads.PanelView; PanelView;
import org.apache.flex.html.supportClasses.PanelLayoutProxy; PanelLayoutProxy;
import org.apache.flex.html.beads.SliderView; SliderView;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
index 876c597..d39caf7 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
@@ -165,56 +165,11 @@ package org.apache.flex.html
positioner = element;
//positioner.style.position = 'relative';
- input = new TextInput();
- input.className = "NumericStepperInput";
- input.typeNames = "NumericStepperInput";
- addElement(input);
- input.positioner.style.display = 'inline-block';
- input.positioner.style.width = '100px';
-
- spinner = new Spinner();
- spinner.addBead(model as IBead);
- addElement(spinner);
-
- /* TODO: ajh move to view and css */
- spinner.positioner.style.display = 'inline-block';
- goog.events.listen(spinner, 'valueChange',
- spinnerChange);
-
element.flexjs_wrapper = this;
className = 'NumericStepper';
- input.text = String(spinner.value);
-
- IEventDispatcher(model).addEventListener("valueChange",modelChangeHandler);
- IEventDispatcher(model).addEventListener("minimumChange",modelChangeHandler);
- IEventDispatcher(model).addEventListener("maximumChange",modelChangeHandler);
- IEventDispatcher(model).addEventListener("stepSizeChange",modelChangeHandler);
- IEventDispatcher(model).addEventListener("snapIntervalChange",modelChangeHandler);
-
return element;
}
- /**
- * @param event The input event.
- */
- COMPILE::JS
- private function spinnerChange(event:Event):void
- {
- var newValue:Number = spinner.value;
- value = newValue;
- input.text = String(spinner.value);
- dispatchEvent(new Event('valueChange'));
- };
-
- /**
- * @private
- */
- COMPILE::JS
- private function modelChangeHandler(event:Event):void
- {
- input.text = String(model.value);
- }
-
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
index 2cc160e..8c93e8d 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
@@ -156,7 +156,6 @@ package org.apache.flex.html
{
element = document.createElement('div') as WrappedHTMLElement;
positioner = element;
- //positioner.style.position = 'relative';
element.style.verticalAlign = 'middle';
element.flexjs_wrapper = this;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as
index 6ebdbf4..032e46e 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/NumericStepperView.as
@@ -79,19 +79,29 @@ package org.apache.flex.html.beads
// add an input field
input = new TextInput();
+ input.className = "NumericStepperInput";
+ input.typeNames = "NumericStepperInput";
IParent(value).addElement(input);
-
+ COMPILE::JS
+ {
+ input.positioner.style.display = 'inline-block';
+ input.positioner.style.width = '100px';
+ }
// add a spinner
spinner = new Spinner();
spinner.addBead( UIBase(value).model as IBead );
IParent(value).addElement(spinner);
spinner.height = input.height;
+ COMPILE::JS
+ {
+ spinner.positioner.style.display = 'inline-block';
+ }
// listen for changes to the text input field which will reset the
// value. ideally, we should either set the input to accept only
// numeric values or, barring that, reject non-numeric entries. we
// cannot do that right now however.
- input.model.addEventListener("textChange",inputChangeHandler);
+ input.addEventListener("change",inputChangeHandler);
// listen for change events on the spinner so the value can be updated as
// as resizing the component
@@ -123,8 +133,11 @@ package org.apache.flex.html.beads
input.x = 2;
input.y = (UIBase(_strand).height - input.height)/2;
input.width = UIBase(_strand).width-spinner.width-2;
+ COMPILE::SWF
+ {
spinner.x = input.width+2;
spinner.y = 0;
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SpinnerView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SpinnerView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SpinnerView.as
index ecb2502..4023036 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SpinnerView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/SpinnerView.as
@@ -102,19 +102,20 @@ COMPILE::JS {
UIBase(_strand).addChild(_decrement);
UIBase(_strand).addChild(_increment);
rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
-
- IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
- IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
}
+ IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
+ IEventDispatcher(value).addEventListener("heightChanged",sizeChangeHandler);
COMPILE::JS {
var host:UIBase = value as UIBase;
_increment = new SpinnerButton();
_increment.text = '\u25B2';
+ _increment.positioner.style.display = 'block';
host.addElement(_increment);
_decrement = new SpinnerButton();
_decrement.text = '\u25BC';
+ _decrement.positioner.style.display = 'block';
host.addElement(_decrement);
// add this in CSS!
@@ -164,17 +165,22 @@ COMPILE::JS {
/**
* @private
*/
- COMPILE::SWF
private function sizeChangeHandler( event:Event ) : void
{
var w:Number = UIBase(_strand).width;
var h:Number = UIBase(_strand).height / 2;
_increment.width = w;
_increment.height = h;
+ COMPILE::SWF
+ {
_increment.y = 0;
+ }
_decrement.width = w;
_decrement.height = h;
+ COMPILE::SWF
+ {
_decrement.y = h;
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec077428/frameworks/projects/Basic/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css b/frameworks/projects/Basic/src/main/resources/defaults.css
index 7a13798..7e2695f 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -409,6 +409,13 @@ Tree
NumericStepper
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
+
+ padding: 0px;
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
}
Panel
@@ -436,6 +443,11 @@ Panel .TitleBar
border-bottom: solid 1px #333333;
}
+.PanelContent
+{
+ background-color: #FFFFFF;
+}
+
SimpleList
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
@@ -460,8 +472,14 @@ Spinner
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
IBeadView: ClassReference("org.apache.flex.html.beads.SpinnerView");
+ width: 16px;
}
+.SpinnerButton
+{
+ padding: 1px;
+ font-size: 6px;
+}
StringItemRenderer
{
@@ -752,13 +770,6 @@ global
NumericStepper
{
- IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
-
- padding: 0px;
- border-style: solid;
- border-color: #000000;
- border-width: 1px;
- background-color: #FFFFFF;
iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
}
[03/12] git commit: [flex-asjs] [refs/heads/release0.8.0] -
SizeToContent doesn't really work anymore in JS. There is no layout or other
pass that sets the unspecified width or height (and probably shouldn't be),
but then overflow:hidden will hide thing
Posted by ah...@apache.org.
SizeToContent doesn't really work anymore in JS. There is no layout or other pass that sets the unspecified width or height (and probably shouldn't be), but then overflow:hidden will hide things because the unspecified width or height will be zero
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f1fb2a57
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f1fb2a57
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f1fb2a57
Branch: refs/heads/release0.8.0
Commit: f1fb2a5797da01d49f074438252e501232659198
Parents: b8b0a27
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 21:25:37 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f1fb2a57/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml b/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
index 439c153..30adb78 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/SupportView.mxml
@@ -56,7 +56,7 @@ The width and height are hard-coded in the root tag to help the Design view.
<js:Label y="10" text="Check Location" className="sectionHeader" x="20"/>
- <js:Container height="150" y="64" style="margin:auto">
+ <js:Container height="200" width="100%" y="64" style="margin:auto">
<js:beads>
<js:VerticalColumnLayout numColumns="2" />
</js:beads>
[04/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - need
StyleChangeNotifier to execute border color changes
Posted by ah...@apache.org.
need StyleChangeNotifier to execute border color changes
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0c25702e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0c25702e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0c25702e
Branch: refs/heads/release0.8.0
Commit: 0c25702ed61984b79c3bedb23a3582053bfc7fff
Parents: f1fb2a5
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:09:09 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/productsView/ProductCatalogThumbnail.mxml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c25702e/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
index bff7e18..5f2c7c2 100755
--- a/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
+++ b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
@@ -35,6 +35,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
<js:LayoutChangeNotifier watchedProperty="{borderStyles.borderColor}" initialValue="#FFFFFF" />
+ <js:StyleChangeNotifier />
</js:beads>
<js:style>
<js:BindableCSSStyles id="borderStyles" borderStyle="solid" borderWidth="1"
[08/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - use
typenames
Posted by ah...@apache.org.
use typenames
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4532aac1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4532aac1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4532aac1
Branch: refs/heads/release0.8.0
Commit: 4532aac1ac744c19db2b409ed2eeef44e596911a
Parents: e9b2c4d
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:10:21 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../Basic/src/main/flex/org/apache/flex/html/ControlBar.as | 1 +
.../Basic/src/main/flex/org/apache/flex/html/NumericStepper.as | 2 +-
.../projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as | 1 +
.../projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as | 1 +
4 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4532aac1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ControlBar.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ControlBar.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ControlBar.as
index 588bd8c..31d917a 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ControlBar.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ControlBar.as
@@ -87,6 +87,7 @@ package org.apache.flex.html
positioner = element;
element.flexjs_wrapper = this;
+ typeNames = "ControlBar";
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4532aac1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
index d39caf7..7a69033 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/NumericStepper.as
@@ -166,7 +166,7 @@ package org.apache.flex.html
//positioner.style.position = 'relative';
element.flexjs_wrapper = this;
- className = 'NumericStepper';
+ typeNames = 'NumericStepper';
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4532aac1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
index 8c93e8d..de92409 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Spinner.as
@@ -159,6 +159,7 @@ package org.apache.flex.html
element.style.verticalAlign = 'middle';
element.flexjs_wrapper = this;
+ typeNames = "Spinner";
return element;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4532aac1/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
index 24cfd24..b2da0f0 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/ToolTip.as
@@ -69,6 +69,7 @@ package org.apache.flex.html
{
var e:WrappedHTMLElement = super.createElement();
positioner.style.position = 'absolute';
+ typeNames = "ToolTIp";
return e;
}
}
[06/12] git commit: [flex-asjs] [refs/heads/release0.8.0] -
MultilineLabel wasn't multiline, at least on Safari
Posted by ah...@apache.org.
MultilineLabel wasn't multiline, at least on Safari
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7b04b395
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7b04b395
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7b04b395
Branch: refs/heads/release0.8.0
Commit: 7b04b3951950302d6596afd6046bb84d2bb5cf33
Parents: 0316364
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 19:38:12 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:58 2017 -0700
----------------------------------------------------------------------
.../Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7b04b395/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as
index 0a77962..a776206 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/MultilineLabel.as
@@ -59,6 +59,7 @@ package org.apache.flex.html
override protected function createElement():WrappedHTMLElement
{
element = document.createElement('div') as WrappedHTMLElement;
+ element.style.whiteSpace = 'normal'; // was nowrap on safari?
positioner = element;
element.flexjs_wrapper = this;
return element;