You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2013/05/04 11:35:07 UTC
[1/3] git commit: [flex-asjs] [refs/heads/feature/fix-html5-example]
- remove duplicated Event metadata for html5 controls
Updated Branches:
refs/heads/feature/fix-html5-example [created] 37648b3df
remove duplicated Event metadata for html5 controls
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fd8613f1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fd8613f1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fd8613f1
Branch: refs/heads/feature/fix-html5-example
Commit: fd8613f18d7399822dccc03245a2fb9f562ac760
Parents: 9de125f
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat May 4 11:33:37 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat May 4 11:33:37 2013 +0200
----------------------------------------------------------------------
.../apache/flex/html5/staticControls/ComboBox.as | 2 --
.../flex/html5/staticControls/DropDownList.as | 2 --
.../org/apache/flex/html5/staticControls/List.as | 2 --
3 files changed, 0 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd8613f1/frameworks/as/src/org/apache/flex/html5/staticControls/ComboBox.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html5/staticControls/ComboBox.as b/frameworks/as/src/org/apache/flex/html5/staticControls/ComboBox.as
index 48aeeac..ebeea35 100644
--- a/frameworks/as/src/org/apache/flex/html5/staticControls/ComboBox.as
+++ b/frameworks/as/src/org/apache/flex/html5/staticControls/ComboBox.as
@@ -20,8 +20,6 @@ package org.apache.flex.html5.staticControls
{
import org.apache.flex.html.staticControls.ComboBox;
- [Event("change", org.apache.flex.events.Event)]
-
public class ComboBox extends org.apache.flex.html.staticControls.ComboBox
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd8613f1/frameworks/as/src/org/apache/flex/html5/staticControls/DropDownList.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html5/staticControls/DropDownList.as b/frameworks/as/src/org/apache/flex/html5/staticControls/DropDownList.as
index 0c2fbb5..1034120 100644
--- a/frameworks/as/src/org/apache/flex/html5/staticControls/DropDownList.as
+++ b/frameworks/as/src/org/apache/flex/html5/staticControls/DropDownList.as
@@ -20,8 +20,6 @@ package org.apache.flex.html5.staticControls
{
import org.apache.flex.html.staticControls.DropDownList;
- [Event("change", org.apache.flex.events.Event)]
-
public class DropDownList extends org.apache.flex.html.staticControls.DropDownList
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fd8613f1/frameworks/as/src/org/apache/flex/html5/staticControls/List.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html5/staticControls/List.as b/frameworks/as/src/org/apache/flex/html5/staticControls/List.as
index 93c3133..387897a 100644
--- a/frameworks/as/src/org/apache/flex/html5/staticControls/List.as
+++ b/frameworks/as/src/org/apache/flex/html5/staticControls/List.as
@@ -20,8 +20,6 @@ package org.apache.flex.html5.staticControls
{
import org.apache.flex.html.staticControls.List;
- [Event("change", org.apache.flex.events.Event)]
-
/**
* Label probably should extend TextField directly,
* but the player's APIs for TextLine do not allow
[2/3] git commit: [flex-asjs] [refs/heads/feature/fix-html5-example]
- update html5 example with button skinning styles
Posted by ca...@apache.org.
update html5 example with button skinning styles
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f4c8d455
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f4c8d455
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f4c8d455
Branch: refs/heads/feature/fix-html5-example
Commit: f4c8d455e22b705470d05679db835b065ba65d9f
Parents: fd8613f
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat May 4 11:34:08 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat May 4 11:34:08 2013 +0200
----------------------------------------------------------------------
examples/FlexJSTest_HTML5/src/MyInitialView.mxml | 18 +++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f4c8d455/examples/FlexJSTest_HTML5/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/src/MyInitialView.mxml b/examples/FlexJSTest_HTML5/src/MyInitialView.mxml
index ac0d891..08d1c7b 100644
--- a/examples/FlexJSTest_HTML5/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_HTML5/src/MyInitialView.mxml
@@ -62,6 +62,23 @@ limitations under the License.
}
]]>
</fx:Script>
+ <fx:Style>
+ @namespace html5 "library://ns.apache.org/flexjs/html5";
+
+ .skinned {
+ background-image: url('ButtonImageUp.png');
+ border-style: none;
+ }
+
+ .skinned:hover {
+ background-image: url('ButtonImageOver.png');
+ }
+
+ .skinned:active {
+ background-image: url('ButtonImageDown.png');
+ }
+
+ </fx:Style>
<html5:Label id="lbl" x="100" y="25" >
<html5:beads>
<basic:SimpleBinding eventName="labelTextChanged"
@@ -113,6 +130,7 @@ limitations under the License.
</html5:beads>
</html5:DropDownList>
<html5:TextButton text="OK" x="200" y="230" click="dispatchEvent(new CustomEvent('buttonClicked'))" />
+ <html5:TextButton text="Skinned" x="200" y="260" width="80" height="24" className="skinned" click="dispatchEvent(new CustomEvent('buttonClicked'))" />
<html5:ComboBox id="comboBox" x="320" y="200" width="100" change="dispatchEvent(new CustomEvent('comboBoxChanged'))">
<html5:beads>
[3/3] git commit: [flex-asjs] [refs/heads/feature/fix-html5-example]
- add button pngs for skinning in html5 example
Posted by ca...@apache.org.
add button pngs for skinning in html5 example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/37648b3d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/37648b3d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/37648b3d
Branch: refs/heads/feature/fix-html5-example
Commit: 37648b3dfbbf8fe5cacc5fa43c5b165224fae9bd
Parents: f4c8d45
Author: Carlos Rovira <ca...@apache.org>
Authored: Sat May 4 11:34:52 2013 +0200
Committer: Carlos Rovira <ca...@apache.org>
Committed: Sat May 4 11:34:52 2013 +0200
----------------------------------------------------------------------
examples/FlexJSTest_HTML5/src/ButtonImageDown.png | Bin 0 -> 206 bytes
examples/FlexJSTest_HTML5/src/ButtonImageOver.png | Bin 0 -> 266 bytes
examples/FlexJSTest_HTML5/src/ButtonImageUp.png | Bin 0 -> 236 bytes
3 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37648b3d/examples/FlexJSTest_HTML5/src/ButtonImageDown.png
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/src/ButtonImageDown.png b/examples/FlexJSTest_HTML5/src/ButtonImageDown.png
new file mode 100644
index 0000000..0cf7f8a
Binary files /dev/null and b/examples/FlexJSTest_HTML5/src/ButtonImageDown.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37648b3d/examples/FlexJSTest_HTML5/src/ButtonImageOver.png
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/src/ButtonImageOver.png b/examples/FlexJSTest_HTML5/src/ButtonImageOver.png
new file mode 100644
index 0000000..2f78d59
Binary files /dev/null and b/examples/FlexJSTest_HTML5/src/ButtonImageOver.png differ
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/37648b3d/examples/FlexJSTest_HTML5/src/ButtonImageUp.png
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_HTML5/src/ButtonImageUp.png b/examples/FlexJSTest_HTML5/src/ButtonImageUp.png
new file mode 100644
index 0000000..927e1c8
Binary files /dev/null and b/examples/FlexJSTest_HTML5/src/ButtonImageUp.png differ