You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/11/26 19:14:48 UTC
[07/12] git commit: [flex-asjs] [refs/heads/core_js_to_as] - use
RangeModel on the JS side
use RangeModel on the JS side
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/522a4cc3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/522a4cc3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/522a4cc3
Branch: refs/heads/core_js_to_as
Commit: 522a4cc3e44b4e746428321257b65f97e02da7e6
Parents: 755ed10
Author: Alex Harui <ah...@apache.org>
Authored: Wed Nov 25 14:04:10 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Nov 25 14:04:10 2015 -0800
----------------------------------------------------------------------
frameworks/projects/HTML/as/defaults.css | 25 +++++++++++++++++----
frameworks/projects/HTML/as/src/HTMLClasses.as | 1 +
2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/522a4cc3/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/defaults.css b/frameworks/projects/HTML/as/defaults.css
index aa25dc5..bb8ca6e 100644
--- a/frameworks/projects/HTML/as/defaults.css
+++ b/frameworks/projects/HTML/as/defaults.css
@@ -164,6 +164,11 @@ Image
vertical-align: top;
}
+ImageAndTextButton
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageAndTextModel");
+}
+
ImageButton
{
border-style: none;
@@ -201,6 +206,11 @@ List
border-color: #222222;
}
+NumericStepper
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+}
+
Panel
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
@@ -239,6 +249,17 @@ SimpleList
IViewportModel: ClassReference("org.apache.flex.html.beads.models.ViewportModel");
}
+Slider
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+}
+
+Spinner
+{
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+}
+
+
StringItemRenderer
{
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
@@ -431,7 +452,6 @@ ImageButton
ImageAndTextButton
{
- IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageAndTextModel");
IBeadView: ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
}
@@ -456,7 +476,6 @@ MultilineLabel
NumericStepper
{
- IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
padding: 0px;
@@ -518,7 +537,6 @@ SimpleAlert
Slider
{
- IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
iBeadView: ClassReference("org.apache.flex.html.beads.SliderView");
iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
@@ -527,7 +545,6 @@ Slider
Spinner
{
- IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
IBeadView: ClassReference("org.apache.flex.html.beads.SpinnerView");
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/522a4cc3/frameworks/projects/HTML/as/src/HTMLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/HTMLClasses.as b/frameworks/projects/HTML/as/src/HTMLClasses.as
index a924b17..052ab95 100644
--- a/frameworks/projects/HTML/as/src/HTMLClasses.as
+++ b/frameworks/projects/HTML/as/src/HTMLClasses.as
@@ -90,6 +90,7 @@ internal class HTMLClasses
import org.apache.flex.html.beads.models.AlertModel; AlertModel;
}
import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel;
+ import org.apache.flex.html.beads.models.RangeModel; RangeModel;
COMPILE::AS3
{
import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel;