Merge branch 'combowork' into develop
* combowork:
Updated ComboBox by separating its model/view/controller more cleanly on the
JS side.
Conflicts:
frameworks/projects/HTML/src/main/resources/defaults.css
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9273772d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9273772d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9273772d
Branch: refs/heads/develop
Commit: 9273772de9a612cba88e8d1d41073efa30b2943c
Parents: 8dcedd2 33fd39e
Author: Peter Ent <[email protected]>
Authored: Wed Nov 30 07:14:57 2016 -0500
Committer: Peter Ent <[email protected]>
Committed: Wed Nov 30 07:14:57 2016 -0500
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/HTMLClasses.as | 4 +-
.../main/flex/org/apache/flex/html/ComboBox.as | 147 ----------
.../org/apache/flex/html/beads/ComboBoxView.as | 279 ++++++++++++++++--
.../org/apache/flex/html/beads/IComboBoxView.as | 12 +-
.../beads/controllers/ComboBoxController.as | 83 ++++++
.../HTML/src/main/resources/defaults.css | 290 +++++++++++++++++--
6 files changed, 619 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9273772d/frameworks/projects/HTML/src/main/resources/defaults.css
----------------------------------------------------------------------
diff --cc frameworks/projects/HTML/src/main/resources/defaults.css
index 6eef06d,02d2cda..d7074e8
--- a/frameworks/projects/HTML/src/main/resources/defaults.css
+++ b/frameworks/projects/HTML/src/main/resources/defaults.css
@@@ -437,271 -439,269 +439,523 @@@ globa
@media -flex-flash
{
-
-Alert
-{
- IBeadModel:
ClassReference("org.apache.flex.html.beads.models.AlertModel");
- IBeadView: ClassReference("org.apache.flex.html.beads.AlertView");
- IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.AlertController");
- iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
- iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
-
- background-color: #FFFFFF;
- border-style: solid;
- border-color: #000000;
- border-width: 1px;
+
+ Alert
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.AlertModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.AlertView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+
+ background-color: #FFFFFF;
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ }
+
+ Border
+ {
+ border-color: inherit;
+ border-style: inherit;
+ border-radius: inherit;
+ border-width: inherit;
+ border: inherit;
+ }
+
+ Button
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSButtonView");
+ }
+
+ CheckBox
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CheckBoxView");
+ }
+
+ CloseButton
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CloseButtonView");
+ }
+
+ ComboBox
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.ComboBoxView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
+ IPopUp:
ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ IDataProviderItemRendererMapper:
ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+ IItemRendererClassFactory:
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer:
ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ }
+
+ Container
+ {
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ ControlBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ DropDownList
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.DropDownListView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
+ IPopUp:
ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ }
+
+ DropDownListList
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IDataProviderItemRendererMapper:
ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+ IItemRendererClassFactory:
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer:
ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ iBackgroundBead:
ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+ border-style: solid;
+ border-radius: 4px;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ HRule
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.HRuleView");
+ }
+
+ ImageButton
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.ImageButtonView");
+ }
+
+ ImageAndTextButton
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
+ }
+
+ Label
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.TextFieldView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
+ }
+
+ List
+ {
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel:
ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+ }
+
+ MultilineLabel
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
+ }
+
+ 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');
+ }
+
+ Panel
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ PanelWithControlBar
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ RadioButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.RadioButtonView");
+ }
+
+ VScrollBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.VScrollBarView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
+ }
+
+ HScrollBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.HScrollBarView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
+ }
+
+ SimpleAlert
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.AlertModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.SimpleAlertView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+
+ background-color: #FFFFFF;
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ }
+
+ Slider
+ {
+ 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");
+ iTrackView:
ClassReference("org.apache.flex.html.beads.SliderTrackView");
+ }
+
+ Spinner
+ {
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
+ }
+
+ TextArea
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.TextAreaView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel:
ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ TextButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+
+ /*
+ TextFieldItemRenderer
+ {
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
+ height: 16;
+ }
+ */
+
+ TextInput
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBackgroundBead:
ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ TitleBar
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ ToggleTextButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
+ }
+
+ View
+ {
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ VRule
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.VRuleView");
+ }
+
+ /* SVG */
+
+ svg|TextButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+
}
+
+ Border
+ {
+ border-color: inherit;
+ border-style: inherit;
+ border-radius: inherit;
+ border-width: inherit;
+ border: inherit;
+ }
+
+ Button
+ {
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
+ }
+
+ CheckBox
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
+ }
+
+ CloseButton
+ {
+ IBeadView: ClassReference("org.apache.flex.html.beads.CloseButtonView");
+ }
+
+ ComboBox
+ {
+ IPopUp:
ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ IDataProviderItemRendererMapper:
ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+ IItemRendererClassFactory:
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer:
ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ }
+
+ Container
+ {
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ ControlBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ DropDownList
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
+ IPopUp:
ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ }
+
+ DropDownListList
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IDataProviderItemRendererMapper:
ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
+ IItemRendererClassFactory:
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+ IItemRenderer:
ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+ iBackgroundBead:
ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+ border-style: solid;
+ border-radius: 4px;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ HRule
+ {
+ IBeadView: ClassReference("org.apache.flex.html.beads.HRuleView");
+ }
+
+ ImageButton
+ {
+ IBeadView: ClassReference("org.apache.flex.html.beads.ImageButtonView");
+ }
+
+ ImageAndTextButton
+ {
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSImageAndTextButtonView");
+ }
+
+ Label
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
+ }
+
+ List
+ {
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel:
ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+ }
+
+ MultilineLabel
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.MultilineTextFieldView");
+ }
+
+ 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');
+ }
+
+ Panel
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ PanelWithControlBar
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ RadioButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.RadioButtonView");
+ }
+
+ VScrollBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.VScrollBarView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
+ }
+
+ HScrollBar
+ {
+ IBeadLayout:
ClassReference("org.apache.flex.html.beads.layouts.HScrollBarLayout");
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.HScrollBarView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.HScrollBarMouseController");
+ }
+
+ SimpleAlert
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.AlertModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.SimpleAlertView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+
+ background-color: #FFFFFF;
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ }
+
+ Slider
+ {
+ 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");
+ iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
+ }
+
+ Spinner
+ {
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
+ }
+
+ TextArea
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel:
ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ TextButton
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+
+ /*
+ TextFieldItemRenderer
+ {
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
+ height: 16;
+ }
+ */
+
+ TextInput
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+ IBeadController:
ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead:
ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBackgroundBead:
ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+ border-style: solid;
+ border-color: #000000;
+ border-width: 1px;
+ background-color: #FFFFFF;
+ }
+
+ TitleBar
+ {
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ }
+
+ ToggleTextButton
+ {
+ IBeadModel:
ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView:
ClassReference("org.apache.flex.html.beads.CSSTextToggleButtonView");
+ }
+
+ View
+ {
+ iBackgroundBead:
ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead:
ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ }
+
+ VRule
+ {
+ IBeadView: ClassReference("org.apache.flex.html.beads.VRuleView");
+ }
+
+ /* SVG */
+
+ svg|TextButton
+ {
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead:
ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
+ }
+
+ }
