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 2014/02/04 19:51:25 UTC
[1/3] git commit: [flex-asjs] [refs/heads/develop] - copy image
assets, if any
Updated Branches:
refs/heads/develop 11f443add -> 0053fff98
copy image assets, if any
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/86d62f17
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/86d62f17
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/86d62f17
Branch: refs/heads/develop
Commit: 86d62f179a4b6cafa6b20c7bcf7444cf93b8c6a9
Parents: 919a5e9
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 4 10:48:58 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 4 10:49:30 2014 -0800
----------------------------------------------------------------------
examples/build_example.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/86d62f17/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 84c25f4..d0a9705 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -67,6 +67,11 @@
versionrevision="0"
output="${basedir}/bin-debug"/>
+ <copy todir="${basedir}/bin-debug">
+ <fileset dir="${basedir}/src">
+ <include name="*.png" />
+ </fileset>
+ </copy>
</target>
<target name="compileas" description="Compiles ${example}">
[3/3] git commit: [flex-asjs] [refs/heads/develop] - remove
constructor args from Button
Posted by ah...@apache.org.
remove constructor args from Button
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0053fff9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0053fff9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0053fff9
Branch: refs/heads/develop
Commit: 0053fff98d7670be7246471701b9fcc7588fcfe2
Parents: 86d62f1
Author: Alex Harui <ah...@apache.org>
Authored: Tue Feb 4 10:49:14 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 4 10:49:31 2014 -0800
----------------------------------------------------------------------
.../flex/createjs/staticControls/TextButton.as | 6 +--
.../apache/flex/html/staticControls/Button.as | 43 +++++++++++++++++++-
.../flex/html/staticControls/TextButton.as | 6 +--
.../apache/flex/html/staticControls/TitleBar.as | 6 ++-
.../html/staticControls/beads/ComboBoxView.as | 5 ++-
.../flex/html5/staticControls/TextButton.as | 6 +--
.../flex/jquery/staticControls/TextButton.as | 6 +--
.../flex/svg/staticControls/TextButton.as | 6 +--
8 files changed, 60 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
index 6764b22..3ad2e66 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/staticControls/TextButton.as
@@ -18,16 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.createjs.staticControls
{
- import flash.display.DisplayObject;
-
import org.apache.flex.core.ITextModel;
import org.apache.flex.html.staticControls.Button;
public class TextButton extends Button
{
- public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ public function TextButton()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
public function get text():String
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
index ce28dc5..18aa828 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/Button.as
@@ -25,13 +25,52 @@ package org.apache.flex.html.staticControls
import org.apache.flex.core.UIButtonBase;
import org.apache.flex.events.IEventDispatcher;
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched when the user clicks on a button.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
[Event(name="click", type="org.apache.flex.events.Event")]
+ /**
+ * The Button class is a simple button. Use TextButton for
+ * buttons that should show text. This is the lightest weight
+ * button used for non-text buttons like the arrow buttons
+ * in a Scrollbar or NumericStepper.
+ *
+ * The most common view for this button is CSSButtonView that
+ * allows you to specify a backgroundImage in CSS that defines
+ * the look of the button.
+ *
+ * However, when used in ScrollBar and when composed in many
+ * other components, it is more common to assign a custom view
+ * to the button.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
public class Button extends UIButtonBase implements IStrand, IEventDispatcher, IUIBase
{
- public function Button(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function Button()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
index 425af1e..5db9916 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TextButton.as
@@ -18,15 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html.staticControls
{
- import flash.display.DisplayObject;
-
import org.apache.flex.core.ITextModel;
public class TextButton extends Button
{
- public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ public function TextButton()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
public function get text():String
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
index 574a5a8..d66d230 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/TitleBar.as
@@ -221,7 +221,11 @@ package org.apache.flex.html.staticControls
hitArea.graphics.drawRect(0, 0, 11, 11);
hitArea.graphics.endFill();
- var button:Button = new Button(upState, overState, downState, hitArea);
+ var button:Button = new Button();
+ button.upState = upState;
+ button.overState = overState;
+ button.downState = downState;
+ button.hitTestState = hitArea;
button.visible = showCloseButton;
button.addEventListener('click',closeButtonHandler);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
index 3aad763..8fa0ffa 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/staticControls/beads/ComboBoxView.as
@@ -123,7 +123,10 @@ package org.apache.flex.html.staticControls.beads
downSprite = new Sprite();
drawButton( downSprite, "down", 18, 18 );
- button = new Button( upSprite, overSprite, downSprite );
+ button = new Button();
+ button.upState = upSprite;
+ button.overState = overSprite;
+ button.downState = downSprite;
DisplayObjectContainer(strand).addChild(button);
button.width = 18;
button.height = 18;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
index 6c87ea4..d23ffb7 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html5/staticControls/TextButton.as
@@ -18,15 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.html5.staticControls
{
- import flash.display.DisplayObject;
-
import org.apache.flex.html.staticControls.TextButton;
public class TextButton extends org.apache.flex.html.staticControls.TextButton
{
- public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ public function TextButton()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
index c2632f3..fb78c83 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/staticControls/TextButton.as
@@ -18,15 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.jquery.staticControls
{
- import flash.display.DisplayObject;
-
import org.apache.flex.html.staticControls.TextButton;
public class TextButton extends org.apache.flex.html.staticControls.TextButton
{
- public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ public function TextButton()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0053fff9/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
index a493e31..bb278bf 100644
--- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
+++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/staticControls/TextButton.as
@@ -18,15 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.svg.staticControls
{
- import flash.display.DisplayObject;
-
import org.apache.flex.html.staticControls.TextButton;
public class TextButton extends org.apache.flex.html.staticControls.TextButton
{
- public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null)
+ public function TextButton()
{
- super(upState, overState, downState, hitTestState);
+ super();
}
}
}
\ No newline at end of file
[2/3] git commit: [flex-asjs] [refs/heads/develop] - re-add
CSSButtonView.as to SWC. Not sure why it was removed but seems to not break
anything
Posted by ah...@apache.org.
re-add CSSButtonView.as to SWC. Not sure why it was removed but seems to not break anything
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/919a5e9f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/919a5e9f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/919a5e9f
Branch: refs/heads/develop
Commit: 919a5e9f8e3142d7a75e6664adf42447daade37d
Parents: 11f443a
Author: Alex Harui <ah...@apache.org>
Authored: Mon Feb 3 17:14:29 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Feb 4 10:49:30 2014 -0800
----------------------------------------------------------------------
frameworks/as/projects/FlexJSUI/defaults.css | 6 +++++-
frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/919a5e9f/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index 3c775fb..3db56a2 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -34,7 +34,6 @@ Button
background-color: #d8d8d8;
border: 1px solid #000000;
padding: 4px;
- /*IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSButtonView");*/
}
Button:hover
@@ -121,6 +120,11 @@ Alert
border-thickness: 1;
}
+Button
+{
+ IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSButtonView");
+}
+
CheckBox
{
IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/919a5e9f/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
index fa30008..1b8e7f7 100644
--- a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
+++ b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
@@ -37,6 +37,7 @@ internal class FlexJSUIClasses
import org.apache.flex.html.staticControls.beads.ComboBoxView; ComboBoxView;
import org.apache.flex.html.staticControls.beads.ContainerView; ContainerView;
import org.apache.flex.html.staticControls.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
+ import org.apache.flex.html.staticControls.beads.CSSButtonView; CSSButtonView;
import org.apache.flex.html.staticControls.beads.CSSTextButtonView; CSSTextButtonView;
import org.apache.flex.html.staticControls.beads.DropDownListView; DropDownListView;
import org.apache.flex.html.staticControls.beads.ImageView; ImageView;