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/09/25 18:04:00 UTC
[18/50] git commit: [flex-asjs] [refs/heads/develop] - fix components
after moving them
fix components after moving them
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/07290345
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/07290345
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/07290345
Branch: refs/heads/develop
Commit: 072903452f3bb9740e25d3254e9eb24c8559865d
Parents: b462b00
Author: Alex Harui <ah...@apache.org>
Authored: Thu Sep 18 14:07:27 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Sep 23 15:01:14 2014 -0700
----------------------------------------------------------------------
.../as/projects/FlexJSJX/basic-manifest.xml | 6 ++++
.../as/projects/FlexJSJX/src/FlexJSJXClasses.as | 1 +
.../org/apache/flex/core/MXMLBeadViewBase.as | 36 +++-----------------
.../apache/flex/html/beads/TitleBarView.mxml | 1 -
.../as/projects/FlexJSUI/basic-manifest.xml | 5 ---
frameworks/as/projects/FlexJSUI/defaults.css | 7 ++++
.../as/projects/FlexJSUI/src/FlexJSUIClasses.as | 1 -
7 files changed, 18 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSJX/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/basic-manifest.xml b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
index a542c14..d601d3c 100644
--- a/frameworks/as/projects/FlexJSJX/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
@@ -62,4 +62,10 @@
<component id="NumberFormatter" class="org.apache.flex.html.accessories.NumberFormatter"/>
<component id="CurrencyFormatter" class="org.apache.flex.html.accessories.CurrencyFormatter"/>
+ <component id="SimpleCSSStyles" class="org.apache.flex.core.SimpleCSSStyles"/>
+ <component id="MXMLBeadViewBase" class="org.apache.flex.core.MXMLBeadViewBase"/>
+ <component id="MXMLBeadViewBaseDataBinding" class="org.apache.flex.core.MXMLBeadViewBaseDataBinding"/>
+ <component id="LayoutChangeNotifier" class="org.apache.flex.html.beads.layouts.LayoutChangeNotifier"/>
+ <component id="ImageButton" class="org.apache.flex.html.ImageButton"/>
+
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
index 8b993cc..d103772 100644
--- a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
+++ b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
@@ -60,6 +60,7 @@ internal class FlexJSJXClasses
import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView;
import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView;
import org.apache.flex.html.beads.layouts.DataGridLayout; DataGridLayout;
+ import org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout; FlexibleFirstChildHorizontalLayout;
import org.apache.flex.html.beads.models.DataGridModel; DataGridModel;
import org.apache.flex.html.beads.models.DateChooserModel; DateChooserModel;
import org.apache.flex.html.beads.models.DataGridPresentationModel; DataGridPresentationModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/MXMLBeadViewBase.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/MXMLBeadViewBase.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/MXMLBeadViewBase.as
index 49172ae..aa8d336 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/MXMLBeadViewBase.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/MXMLBeadViewBase.as
@@ -18,15 +18,13 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
- import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
-
import mx.states.State;
import org.apache.flex.core.IBead;
import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.html.beads.ContainerView;
import org.apache.flex.events.Event;
import org.apache.flex.events.ValueChangeEvent;
import org.apache.flex.utils.MXMLDataInterpreter;
@@ -43,7 +41,7 @@ package org.apache.flex.core
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class MXMLBeadViewBase extends BeadViewBase implements IStrand, ILayoutParent
+ public class MXMLBeadViewBase extends ContainerView implements IStrand, ILayoutParent
{
/**
* Constructor.
@@ -255,7 +253,7 @@ package org.apache.flex.core
*/
public var beads:Array;
- private var _beads:Vector.<IBead>;
+ private var _beads:Array;
/**
* @copy org.apache.flex.core.IStrand#addBead()
@@ -268,7 +266,7 @@ package org.apache.flex.core
public function addBead(bead:IBead):void
{
if (!_beads)
- _beads = new Vector.<IBead>;
+ _beads = [];
_beads.push(bead);
bead.strand = this;
}
@@ -314,31 +312,5 @@ package org.apache.flex.core
return null;
}
- /**
- * The parent of the children.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get contentView():IParentIUIBase
- {
- return _strand as IParentIUIBase;
- }
-
- /**
- * The host component, which can resize to different slots.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get resizableView():IUIBase
- {
- return _strand as IUIBase;
- }
-
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
index 47e72c2..28a29eb 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/beads/TitleBarView.mxml
@@ -38,7 +38,6 @@ limitations under the License.
<basic:beads>
<basic:MXMLBeadViewBaseDataBinding />
<basic:LayoutChangeNotifier watchedProperty="{ITitleBarModel(model).title}" />
- <basic:SolidBackgroundBead />
</basic:beads>
<basic:Label id="titleLabel" text="{ITitleBarModel(model).title}"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSUI/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/basic-manifest.xml b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
index f97d70d..01cc765 100644
--- a/frameworks/as/projects/FlexJSUI/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
@@ -23,10 +23,7 @@
<component id="Application" class="org.apache.flex.core.Application"/>
<component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
- <component id="SimpleCSSStyles" class="org.apache.flex.core.SimpleCSSStyles"/>
<component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
- <component id="MXMLBeadViewBase" class="org.apache.flex.core.MXMLBeadViewBase"/>
- <component id="MXMLBeadViewBaseDataBinding" class="org.apache.flex.core.MXMLBeadViewBaseDataBinding"/>
<component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
<component id="ConstantBinding" class="org.apache.flex.binding.ConstantBinding"/>
<component id="SimpleBinding" class="org.apache.flex.binding.SimpleBinding"/>
@@ -36,7 +33,6 @@
<component id="DropDownList" class="org.apache.flex.html.DropDownList"/>
<component id="DropDownListList" class="org.apache.flex.html.supportClasses.DropDownListList"/>
<component id="Image" class="org.apache.flex.html.Image"/>
- <component id="ImageButton" class="org.apache.flex.html.ImageButton"/>
<component id="Label" class="org.apache.flex.html.Label"/>
<component id="TextButton" class="org.apache.flex.html.TextButton"/>
<component id="ToggleTextButton" class="org.apache.flex.html.ToggleTextButton"/>
@@ -68,7 +64,6 @@
<component id="NonVirtualVerticalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout"/>
<component id="NonVirtualHorizontalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout"/>
<component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
- <component id="LayoutChangeNotifier" class="org.apache.flex.html.beads.layouts.LayoutChangeNotifier"/>
<component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
<component id="Alert" class="org.apache.flex.html.Alert"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index a723ceb..dd8bff1 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -379,6 +379,13 @@ TextInput
height: 20;
}
+TitleBar
+{
+ iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ background-color: #FFFFFF;
+}
+
ToggleTextButton
{
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/07290345/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 51b0839..4d2f225 100644
--- a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
+++ b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as
@@ -101,7 +101,6 @@ internal class FlexJSUIClasses
import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout;
import org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout;
import org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout;
- import org.apache.flex.html.beads.layouts.FlexibleFirstChildHorizontalLayout; FlexibleFirstChildHorizontalLayout;
import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;