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/04/16 16:34:19 UTC
[9/9] git commit: [flex-asjs] [refs/heads/develop] - More removal on
'NonVirtual'
More removal on 'NonVirtual'
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ba378c00
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ba378c00
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ba378c00
Branch: refs/heads/develop
Commit: ba378c0039d97effad059d330643b979137d028f
Parents: e17416c
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 15 17:30:38 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 15 17:30:38 2015 -0700
----------------------------------------------------------------------
examples/ChartExample/src/SpeedTestView.mxml | 6 +-
examples/DataBindingTest/src/MyInitialView.mxml | 8 +-
.../DataBindingTest_as/src/DataBindingTest.as | 12 +-
.../DataBindingTest_as/src/MyInitialView.as | 12 +-
.../html/customControls/beads/DataGridView.as | 4 +-
examples/DesktopMap/src/MyInitialView.mxml | 6 +-
examples/EffectsExample/src/MyInitialView.mxml | 4 +-
examples/FlexJSStore/src/FlexJSStore.mxml | 4 +-
examples/FlexJSStore/src/main.css | 2 +-
.../src/productsView/ProductCatalogPanel.mxml | 4 +-
.../src/productsView/ProductList.mxml | 2 +-
.../FlexJSStore_jquery/src/FlexJSStore.mxml | 4 +-
examples/FlexJSStore_jquery/src/main.css | 2 +-
.../src/productsView/ProductCatalogPanel.mxml | 4 +-
.../src/productsView/ProductList.mxml | 2 +-
.../FlexJSTest_Panel/src/MyInitialView.mxml | 2 +-
examples/FormExample/src/MyFormView.mxml | 2 +-
examples/FormatExample/src/MyFormView.mxml | 14 +-
.../FormatExample/src/dialogs/LoginDialog.mxml | 8 +-
examples/ImageTest/src/MyInitialView.mxml | 2 +-
examples/MapSearch/src/MyInitialView.mxml | 6 +-
examples/MobileTrader/src/MyInitialView.mxml | 2 +-
examples/MobileTrader/src/views/AlertsView.mxml | 2 +-
examples/MobileTrader/src/views/AssetsView.mxml | 4 +-
examples/MobileTrader/src/views/StockView.mxml | 2 +-
.../MobileTrader/src/views/WatchListView.mxml | 6 +-
examples/StatesTest/src/MyInitialView.mxml | 8 +-
examples/StockQuote/src/MyInitialView.mxml | 8 +-
.../src/sample/todo/views/TodoListView.mxml | 4 +-
.../charts/supportClasses/ChartDataGroup.as | 6 +-
.../flex/charts/core/IHorizontalAxisBead.js | 2 +-
.../charts/supportClasses/ChartDataGroup.js | 6 +-
frameworks/projects/HTML/as/defaults.css | 16 +--
frameworks/projects/HTML/as/src/HTMLClasses.as | 8 +-
.../as/src/org/apache/flex/html/HContainer.as | 4 +-
.../as/src/org/apache/flex/html/VContainer.as | 4 +-
.../src/org/apache/flex/html/beads/ListView.as | 2 +-
.../flex/html/beads/ListViewNoSelectionState.as | 2 +-
.../flex/html/beads/NumericStepperView.as | 4 +-
.../flex/html/beads/layouts/BasicLayout.as | 6 +-
.../html/beads/layouts/BasicScrollingLayout.as | 6 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 6 +-
.../beads/layouts/HorizontalScrollingLayout.as | 6 +-
.../flex/html/beads/layouts/VerticalLayout.as | 6 +-
.../beads/layouts/VerticalScrollingLayout.as | 6 +-
.../flex/html/supportClasses/DataGroup.as | 6 +-
frameworks/projects/HTML/basic-manifest.xml | 12 +-
.../js/src/org/apache/flex/html/ButtonBar.js | 4 +-
.../src/org/apache/flex/html/beads/ListView.js | 2 +-
.../flex/html/beads/layouts/BasicLayout.js | 134 +++++++++++++++++++
.../html/beads/layouts/BasicScrollingLayout.js | 99 ++++++++++++++
.../flex/html/beads/layouts/HorizontalLayout.js | 116 ++++++++++++++++
.../html/beads/layouts/NonVirtualBasicLayout.js | 134 -------------------
.../layouts/NonVirtualBasicScrollingLayout.js | 99 --------------
.../beads/layouts/NonVirtualHorizontalLayout.js | 116 ----------------
.../beads/layouts/NonVirtualVerticalLayout.js | 114 ----------------
.../NonVirtualVerticalScrollingLayout.js | 52 -------
.../flex/html/beads/layouts/VerticalLayout.js | 114 ++++++++++++++++
.../beads/layouts/VerticalScrollingLayout.js | 52 +++++++
.../flex/html/supportClasses/DataGroup.js | 134 +++++++++++++++++++
.../html/supportClasses/NonVirtualDataGroup.js | 134 -------------------
.../flex/mobile/beads/StackedViewManagerView.as | 8 +-
.../flex/mobile/beads/TabbedViewManagerView.as | 6 +-
mustella/tests/basicTests/BasicTests.css | 2 +-
mustella/tests/basicTests/shim/VBox.as | 4 +-
65 files changed, 789 insertions(+), 789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/ChartExample/src/SpeedTestView.mxml
----------------------------------------------------------------------
diff --git a/examples/ChartExample/src/SpeedTestView.mxml b/examples/ChartExample/src/SpeedTestView.mxml
index 40c619e..d1d4b2c 100644
--- a/examples/ChartExample/src/SpeedTestView.mxml
+++ b/examples/ChartExample/src/SpeedTestView.mxml
@@ -86,7 +86,7 @@ limitations under the License.
<js:Container x="20" y="20">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Points:" />
<js:TextInput id="numPoints" text="300" />
@@ -170,7 +170,7 @@ limitations under the License.
<js:Container x="150" y="325">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:TextButton text="SVG Go" click="startTimingSVG()" />
<js:Label text=" (results)" id="svgChartResults" />
@@ -178,7 +178,7 @@ limitations under the License.
<js:Container x="650" y="325">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:TextButton text="Reg Go" click="startTimingReg()" />
<js:Label text=" (results)" id="regChartResults" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/DataBindingTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest/src/MyInitialView.mxml b/examples/DataBindingTest/src/MyInitialView.mxml
index e5b16cd..f81deeb 100644
--- a/examples/DataBindingTest/src/MyInitialView.mxml
+++ b/examples/DataBindingTest/src/MyInitialView.mxml
@@ -105,16 +105,16 @@ limitations under the License.
</js:beads>
<js:Container x="0" y="0" className="topContainer" >
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label width="300" text="Enter Stock Symbol or choose from list:" />
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Container className="leftSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:TextInput id="symbolTI" text="{MyModel(applicationModel).stockSymbol}" />
<js:TextButton text="Get Quote" className="quoteButton"
@@ -124,7 +124,7 @@ limitations under the License.
</js:Container>
<js:Container className="rightSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:DropDownList id="list" width="100" height="17"
change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))"
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/DataBindingTest_as/src/DataBindingTest.as
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest_as/src/DataBindingTest.as b/examples/DataBindingTest_as/src/DataBindingTest.as
index 36bc0ab..56d1a0e 100644
--- a/examples/DataBindingTest_as/src/DataBindingTest.as
+++ b/examples/DataBindingTest_as/src/DataBindingTest.as
@@ -43,14 +43,14 @@ import org.apache.flex.html.beads.controllers.DropDownListController;
import org.apache.flex.html.beads.controllers.ItemRendererMouseController;
import org.apache.flex.html.beads.controllers.EditableTextKeyboardController;
import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController;
-import org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout;
+import org.apache.flex.html.beads.layouts.VerticalScrollingLayout;
import org.apache.flex.html.beads.models.ArraySelectionModel;
import org.apache.flex.html.beads.models.SingleLineBorderModel;
import org.apache.flex.html.beads.models.TextModel;
import org.apache.flex.html.beads.models.ToggleButtonModel;
import org.apache.flex.html.beads.models.ValueToggleButtonModel;
import org.apache.flex.html.supportClasses.DropDownListList;
-import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
+import org.apache.flex.html.supportClasses.DataGroup;
import org.apache.flex.html.supportClasses.StringItemRenderer;
import org.apache.flex.net.HTTPService;
import org.apache.flex.collections.parsers.JSONInputParser;
@@ -116,8 +116,8 @@ public class DataBindingTest extends Application
iBeadModel: ArraySelectionModel,
iBeadView: ListView,
iBeadController: ListSingleSelectionMouseController,
- iBeadLayout: NonVirtualVerticalScrollingLayout,
- iDataGroup: NonVirtualDataGroup,
+ iBeadLayout: VerticalScrollingLayout,
+ iDataGroup: DataGroup,
iDataProviderItemRendererMapper: DataItemRendererFactoryForArrayData,
iItemRendererClassFactory: ItemRendererClassFactory,
iItemRenderer: StringItemRenderer
@@ -229,8 +229,8 @@ public class DataBindingTest extends Application
iBeadModel: ArraySelectionModel,
iBeadView: ListView,
iBeadController: ListSingleSelectionMouseController,
- iBeadLayout: NonVirtualVerticalScrollingLayout,
- iDataGroup: NonVirtualDataGroup,
+ iBeadLayout: VerticalScrollingLayout,
+ iDataGroup: DataGroup,
iDataProviderItemRendererMapper: TextItemRendererFactoryForArrayData,
iItemRendererClassFactory: ItemRendererClassFactory,
iItemRenderer: StringItemRenderer
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/DataBindingTest_as/src/MyInitialView.as
----------------------------------------------------------------------
diff --git a/examples/DataBindingTest_as/src/MyInitialView.as b/examples/DataBindingTest_as/src/MyInitialView.as
index 040ecbd..1c31b58 100644
--- a/examples/DataBindingTest_as/src/MyInitialView.as
+++ b/examples/DataBindingTest_as/src/MyInitialView.as
@@ -38,8 +38,8 @@ import org.apache.flex.html.RadioButton;
import org.apache.flex.html.TextArea;
import org.apache.flex.html.TextButton;
import org.apache.flex.html.TextInput;
-import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
-import org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout;
+import org.apache.flex.html.beads.layouts.HorizontalLayout;
+import org.apache.flex.html.beads.layouts.VerticalLayout;
public class MyInitialView extends ViewBase
{
@@ -137,18 +137,18 @@ public class MyInitialView extends ViewBase
c.x = 0;
c.y = 0;
c.className = "topContainer";
- c.addBead(new NonVirtualVerticalLayout());
+ c.addBead(new VerticalLayout());
addElement(c);
var l:Label = new Label();
l.width = 300;
l.text = "Enter Stock Symbol or choose from list:";
c.addElement(l);
var c2:Container = new Container();
- c2.addBead(new NonVirtualHorizontalLayout());
+ c2.addBead(new HorizontalLayout());
c.addElement(c2);
var c3:Container = new Container();
c3.className = "leftSide";
- c3.addBead(new NonVirtualVerticalLayout());
+ c3.addBead(new VerticalLayout());
c2.addElement(c3);
symbolTI = new TextInput();
var sb:SimpleBinding = new SimpleBinding();
@@ -190,7 +190,7 @@ public class MyInitialView extends ViewBase
c3 = new Container();
c3.className="rightSide";
- c3.addBead(new NonVirtualVerticalLayout());
+ c3.addBead(new VerticalLayout());
c2.addElement(c3);
list = new DropDownList();
list.width=100;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
index 97f59e8..15fe694 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
@@ -34,7 +34,7 @@ package org.apache.flex.html.customControls.beads
import org.apache.flex.html.Container;
import org.apache.flex.html.List;
import org.apache.flex.html.SimpleList;
- import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.html.beads.models.ArraySelectionModel;
public class DataGridView implements IDataGridView
@@ -67,7 +67,7 @@ package org.apache.flex.html.customControls.beads
UIBase(_strand).addElement(buttonBar);
columnContainer = new Container();
- var layout:NonVirtualHorizontalLayout = new NonVirtualHorizontalLayout();
+ var layout:HorizontalLayout = new HorizontalLayout();
columnContainer.addBead(layout);
UIBase(_strand).addElement(columnContainer);
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/DesktopMap/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/DesktopMap/src/MyInitialView.mxml b/examples/DesktopMap/src/MyInitialView.mxml
index b00700a..6ab8a67 100644
--- a/examples/DesktopMap/src/MyInitialView.mxml
+++ b/examples/DesktopMap/src/MyInitialView.mxml
@@ -102,12 +102,12 @@ limitations under the License.
<js:Container x="5" y="5" className="topContainer" >
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Location:" />
<js:TextInput id="mapLocation" />
@@ -118,7 +118,7 @@ limitations under the License.
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Search on Map:" />
<js:TextInput id="search" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/EffectsExample/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/EffectsExample/src/MyInitialView.mxml b/examples/EffectsExample/src/MyInitialView.mxml
index 0f3054d..9fa98e3 100644
--- a/examples/EffectsExample/src/MyInitialView.mxml
+++ b/examples/EffectsExample/src/MyInitialView.mxml
@@ -66,12 +66,12 @@ limitations under the License.
<js:Container width="600" height="700" x="50" y="50">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Container width="600" height="40">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:TextButton text="swap" click="swapit()" />
<js:TextButton text="fade out" click="fadeout()" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore/src/FlexJSStore.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/FlexJSStore.mxml b/examples/FlexJSStore/src/FlexJSStore.mxml
index 07596ef..a3a1d10 100755
--- a/examples/FlexJSStore/src/FlexJSStore.mxml
+++ b/examples/FlexJSStore/src/FlexJSStore.mxml
@@ -224,11 +224,11 @@ limitations under the License.
</js:Transition>
</js:transitions>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:ControlBar id="acb" width="100%" className="storeControlBar" >
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
<js:LayoutChangeNotifier watchedProperty="{image.width}" />
</js:beads>
<js:Image id="image" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore/src/main.css
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/main.css b/examples/FlexJSStore/src/main.css
index 938413e..0787a24 100755
--- a/examples/FlexJSStore/src/main.css
+++ b/examples/FlexJSStore/src/main.css
@@ -79,7 +79,7 @@ HRule
basic|Container
{
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualBasicLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
}
.sectionHeader
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml b/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
index 59f968f..e079ad2 100755
--- a/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductCatalogPanel.mxml
@@ -505,7 +505,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
<js:DragMouseController id="dragger" />
<js:ParentDocumentBead id="pdb" />
<js:PanelView>
@@ -525,7 +525,7 @@ limitations under the License.
<js:Container id="thumbContentGroup" width="100%" height="100%">
<js:beads>
<js:ScrollingContainerView id="scv" />
- <js:NonVirtualBasicScrollingLayout />
+ <js:BasicScrollingLayout />
</js:beads>
<js:Container id="thumbContent" width="100%" height="100%" />
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore/src/productsView/ProductList.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore/src/productsView/ProductList.mxml b/examples/FlexJSStore/src/productsView/ProductList.mxml
index 34c9980..fe79b53 100755
--- a/examples/FlexJSStore/src/productsView/ProductList.mxml
+++ b/examples/FlexJSStore/src/productsView/ProductList.mxml
@@ -213,7 +213,7 @@ limitations under the License.
<js:beads>
<js:DropMouseController id="dmc" dragEnter="doDragEnter(event)" dragDrop="doDragDrop(event)" />
<js:ScrollingContainerView id="scrollingView" />
- <js:NonVirtualVerticalScrollingLayout />
+ <js:VerticalScrollingLayout />
</js:beads>
<js:Container id="viewport" width="100%" height="100%" >
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore_jquery/src/FlexJSStore.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore_jquery/src/FlexJSStore.mxml b/examples/FlexJSStore_jquery/src/FlexJSStore.mxml
index de6040f..ca53973 100755
--- a/examples/FlexJSStore_jquery/src/FlexJSStore.mxml
+++ b/examples/FlexJSStore_jquery/src/FlexJSStore.mxml
@@ -224,11 +224,11 @@ limitations under the License.
</js:Transition>
</js:transitions>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:ControlBar id="acb" width="100%" className="storeControlBar" >
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
<js:LayoutChangeNotifier watchedProperty="{image.width}" />
</js:beads>
<js:Image id="image" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore_jquery/src/main.css
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore_jquery/src/main.css b/examples/FlexJSStore_jquery/src/main.css
index 938413e..0787a24 100755
--- a/examples/FlexJSStore_jquery/src/main.css
+++ b/examples/FlexJSStore_jquery/src/main.css
@@ -79,7 +79,7 @@ HRule
basic|Container
{
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualBasicLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.BasicLayout");
}
.sectionHeader
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml b/examples/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml
index 4d10bbd..f6846c7 100755
--- a/examples/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml
+++ b/examples/FlexJSStore_jquery/src/productsView/ProductCatalogPanel.mxml
@@ -505,7 +505,7 @@ limitations under the License.
<js:beads>
<js:ContainerDataBinding />
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
<js:DragMouseController id="dragger" />
<js:ParentDocumentBead id="pdb" />
<js:PanelView>
@@ -525,7 +525,7 @@ limitations under the License.
<js:Container id="thumbContentGroup" width="100%" height="100%">
<js:beads>
<js:ScrollingContainerView id="scv" />
- <js:NonVirtualBasicScrollingLayout />
+ <js:BasicScrollingLayout />
</js:beads>
<js:Container id="thumbContent" width="100%" height="100%" />
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSStore_jquery/src/productsView/ProductList.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSStore_jquery/src/productsView/ProductList.mxml b/examples/FlexJSStore_jquery/src/productsView/ProductList.mxml
index 981d6c9..5dd38e3 100755
--- a/examples/FlexJSStore_jquery/src/productsView/ProductList.mxml
+++ b/examples/FlexJSStore_jquery/src/productsView/ProductList.mxml
@@ -210,7 +210,7 @@ limitations under the License.
<js:beads>
<js:DropMouseController id="dmc" dragEnter="doDragEnter(event)" dragDrop="doDragDrop(event)" />
<js:ScrollingContainerView id="scrollingView" />
- <js:NonVirtualVerticalScrollingLayout />
+ <js:VerticalScrollingLayout />
</js:beads>
<js:Container id="viewport" width="100%" height="100%" >
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FlexJSTest_Panel/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_Panel/src/MyInitialView.mxml b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
index 81e2714..25323dc 100644
--- a/examples/FlexJSTest_Panel/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
@@ -121,7 +121,7 @@ limitations under the License.
<js:Panel title="Example" x="300" width="300" y="50" className="panel1" showCloseButton="true">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label text="Displays a SimpleAlert that has an OK button." />
<js:TextButton text="Show Simple Alert" click="showSimpleAlert()" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FormExample/src/MyFormView.mxml
----------------------------------------------------------------------
diff --git a/examples/FormExample/src/MyFormView.mxml b/examples/FormExample/src/MyFormView.mxml
index 36ec16e..894d7a2 100644
--- a/examples/FormExample/src/MyFormView.mxml
+++ b/examples/FormExample/src/MyFormView.mxml
@@ -42,7 +42,7 @@ limitations under the License.
<js:Container width="600" height="700" x="50" y="50">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label text="Loan Form" className="title" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FormatExample/src/MyFormView.mxml
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/MyFormView.mxml b/examples/FormatExample/src/MyFormView.mxml
index 31272a7..d974bf5 100644
--- a/examples/FormatExample/src/MyFormView.mxml
+++ b/examples/FormatExample/src/MyFormView.mxml
@@ -60,14 +60,14 @@ limitations under the License.
<js:Container width="600" height="700" x="50" y="50">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label text="Loan Form" className="title" />
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Your Name:" />
<js:TextInput id="nameField" />
@@ -75,7 +75,7 @@ limitations under the License.
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Your Age:" />
<js:TextInput id="ageField">
@@ -87,7 +87,7 @@ limitations under the License.
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Phone Number:" />
<js:TextInput id="phoneField" >
@@ -101,7 +101,7 @@ limitations under the License.
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Date of Loan:" />
<js:DateField id="dateOfLoan"/>
@@ -109,7 +109,7 @@ limitations under the License.
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Loan Amount:" />
<js:TextInput id="loanAmount">
@@ -123,7 +123,7 @@ limitations under the License.
<js:Container width="500">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:TextButton text="Login" click="showLogin()" />
</js:Container>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/FormatExample/src/dialogs/LoginDialog.mxml
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/dialogs/LoginDialog.mxml b/examples/FormatExample/src/dialogs/LoginDialog.mxml
index 8d43c3a..527983c 100644
--- a/examples/FormatExample/src/dialogs/LoginDialog.mxml
+++ b/examples/FormatExample/src/dialogs/LoginDialog.mxml
@@ -40,12 +40,12 @@ limitations under the License.
</fx:Script>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Container width="200">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="User Name:" />
<js:TextInput />
@@ -53,7 +53,7 @@ limitations under the License.
<js:Container width="200">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Password:" />
<js:TextInput />
@@ -61,7 +61,7 @@ limitations under the License.
<js:Container width="200">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:TextButton text="Login" click="cancelLogin()" />
<js:TextButton text="Cancel" click="cancelLogin()" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/ImageTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/ImageTest/src/MyInitialView.mxml b/examples/ImageTest/src/MyInitialView.mxml
index 63a5b8e..342abcc 100644
--- a/examples/ImageTest/src/MyInitialView.mxml
+++ b/examples/ImageTest/src/MyInitialView.mxml
@@ -32,7 +32,7 @@ limitations under the License.
<js:Container>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Image width="48" height="48" source="smallbluerect.jpg" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MapSearch/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/MapSearch/src/MyInitialView.mxml b/examples/MapSearch/src/MyInitialView.mxml
index 4bf35b3..6d55830 100644
--- a/examples/MapSearch/src/MyInitialView.mxml
+++ b/examples/MapSearch/src/MyInitialView.mxml
@@ -168,12 +168,12 @@ limitations under the License.
<js:Container x="5" y="5" className="topContainer" >
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Container className="InnerBox">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label id="label1" text="Location:" className="FormLabel" />
<js:TextInput id="mapLocation" />
@@ -190,7 +190,7 @@ limitations under the License.
<js:Container className="InnerBox">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label id="label2" text="Search on Map:" className="FormLabel" />
<js:TextInput id="search" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MobileTrader/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/MyInitialView.mxml b/examples/MobileTrader/src/MyInitialView.mxml
index 67072cd..b43e4b6 100755
--- a/examples/MobileTrader/src/MyInitialView.mxml
+++ b/examples/MobileTrader/src/MyInitialView.mxml
@@ -56,7 +56,7 @@ limitations under the License.
.NavigationBar {
background-image: url("assets/background.png");
height: 55px;
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
}
.TabBar {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MobileTrader/src/views/AlertsView.mxml
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/views/AlertsView.mxml b/examples/MobileTrader/src/views/AlertsView.mxml
index ffb46c7..247ac2b 100755
--- a/examples/MobileTrader/src/views/AlertsView.mxml
+++ b/examples/MobileTrader/src/views/AlertsView.mxml
@@ -52,7 +52,7 @@ limitations under the License.
<js:Container x="4" y="10" >
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Symbol:" />
<js:TextInput id="symbolField" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MobileTrader/src/views/AssetsView.mxml
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/views/AssetsView.mxml b/examples/MobileTrader/src/views/AssetsView.mxml
index 114426e..c5f4f2b 100755
--- a/examples/MobileTrader/src/views/AssetsView.mxml
+++ b/examples/MobileTrader/src/views/AssetsView.mxml
@@ -34,7 +34,7 @@ limitations under the License.
</fx:Metadata>
<js:beads>
- <js:NonVirtualBasicLayout />
+ <js:BasicLayout />
</js:beads>
<js:model>
@@ -43,7 +43,7 @@ limitations under the License.
<js:Container className="AssetsInner" width="480">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:style>
<js:SimpleCSSStyles top="0" left="0" right="0" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MobileTrader/src/views/StockView.mxml
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/views/StockView.mxml b/examples/MobileTrader/src/views/StockView.mxml
index 998a76a..b660407 100755
--- a/examples/MobileTrader/src/views/StockView.mxml
+++ b/examples/MobileTrader/src/views/StockView.mxml
@@ -70,7 +70,7 @@ limitations under the License.
<js:Container>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
<js:ViewBaseDataBinding />
</js:beads>
<js:style>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/MobileTrader/src/views/WatchListView.mxml
----------------------------------------------------------------------
diff --git a/examples/MobileTrader/src/views/WatchListView.mxml b/examples/MobileTrader/src/views/WatchListView.mxml
index 42048f3..f336f6f 100755
--- a/examples/MobileTrader/src/views/WatchListView.mxml
+++ b/examples/MobileTrader/src/views/WatchListView.mxml
@@ -85,12 +85,12 @@ limitations under the License.
</fx:Script>
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Container className="WatchListInputArea">
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Label text="Symbol:" />
<js:TextInput id="symbolName" />
@@ -100,7 +100,7 @@ limitations under the License.
<js:Container x="0" y="0" className="WatchListInner">
<js:beads>
<js:ScrollingContainerView />
- <js:NonVirtualVerticalScrollingLayout />
+ <js:VerticalScrollingLayout />
</js:beads>
<js:DataGrid id="dataGrid" change="selectRow()" width="480" height="480" className="WatchListDataGrid">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/StatesTest/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/StatesTest/src/MyInitialView.mxml b/examples/StatesTest/src/MyInitialView.mxml
index 116ea19..c186354 100644
--- a/examples/StatesTest/src/MyInitialView.mxml
+++ b/examples/StatesTest/src/MyInitialView.mxml
@@ -99,16 +99,16 @@ limitations under the License.
</js:states>
<js:Container x="0" y="0" className="topContainer" >
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label width="300" text="Enter Stock Symbol or choose from list:" />
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Container className="leftSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:TextInput id="symbolTI" >
<js:beads>
@@ -132,7 +132,7 @@ limitations under the License.
</js:Container>
<js:Container className="rightSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:DropDownList id="list" width="100" height="17"
change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/StockQuote/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/StockQuote/src/MyInitialView.mxml b/examples/StockQuote/src/MyInitialView.mxml
index 95f3a8c..0d5697f 100644
--- a/examples/StockQuote/src/MyInitialView.mxml
+++ b/examples/StockQuote/src/MyInitialView.mxml
@@ -102,16 +102,16 @@ limitations under the License.
</fx:Style>
<js:Container x="0" y="0" className="topContainer" >
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:Label width="300" text="Enter Stock Symbol or choose from list:" />
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout />
+ <js:HorizontalLayout />
</js:beads>
<js:Panel title="Left Side" className="leftSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:TextInput id="symbolTI" >
<js:beads>
@@ -135,7 +135,7 @@ limitations under the License.
</js:Panel>
<js:Panel title="Right Side" className="rightSide">
<js:beads>
- <js:NonVirtualVerticalLayout />
+ <js:VerticalLayout />
</js:beads>
<js:DropDownList id="list" width="100" height="17"
change="_symbol = list.selectedItem as String; dispatchEvent(new CustomEvent('listChanged'))">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
----------------------------------------------------------------------
diff --git a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
index 9cff3cf..153fb76 100644
--- a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
+++ b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
@@ -59,7 +59,7 @@ limitations under the License.
<js:Panel title="FlexJS TODO List" width="600">
<js:beads>
- <js:NonVirtualVerticalLayout/>
+ <js:VerticalLayout/>
</js:beads>
<js:TextInput id="todoInput"
@@ -79,7 +79,7 @@ limitations under the License.
<js:Container>
<js:beads>
- <js:NonVirtualHorizontalLayout/>
+ <js:HorizontalLayout/>
</js:beads>
<js:Label id="statusLabel" text="N items left"/>
<svg:TextButton text="All" width="100" height="30" click="showAll()" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/Charts/as/src/org/apache/flex/charts/supportClasses/ChartDataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/as/src/org/apache/flex/charts/supportClasses/ChartDataGroup.as b/frameworks/projects/Charts/as/src/org/apache/flex/charts/supportClasses/ChartDataGroup.as
index f6bbd89..7e7519d 100644
--- a/frameworks/projects/Charts/as/src/org/apache/flex/charts/supportClasses/ChartDataGroup.as
+++ b/frameworks/projects/Charts/as/src/org/apache/flex/charts/supportClasses/ChartDataGroup.as
@@ -23,7 +23,7 @@ package org.apache.flex.charts.supportClasses
import org.apache.flex.charts.core.IChartSeries;
import org.apache.flex.core.IUIBase;
import org.apache.flex.geom.Point;
- import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
+ import org.apache.flex.html.supportClasses.DataGroup;
/**
* The ChartDataGroup class provides the actual space for rendering the
@@ -34,7 +34,7 @@ package org.apache.flex.charts.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class ChartDataGroup extends NonVirtualDataGroup implements IChartDataGroup
+ public class ChartDataGroup extends DataGroup implements IChartDataGroup
{
/**
* constructor.
@@ -97,4 +97,4 @@ package org.apache.flex.charts.supportClasses
return null;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/Charts/js/src/org/apache/flex/charts/core/IHorizontalAxisBead.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/js/src/org/apache/flex/charts/core/IHorizontalAxisBead.js b/frameworks/projects/Charts/js/src/org/apache/flex/charts/core/IHorizontalAxisBead.js
index e3173de..8ff8359 100644
--- a/frameworks/projects/Charts/js/src/org/apache/flex/charts/core/IHorizontalAxisBead.js
+++ b/frameworks/projects/Charts/js/src/org/apache/flex/charts/core/IHorizontalAxisBead.js
@@ -57,4 +57,4 @@ Object.defineProperties(org_apache_flex_charts_core_IHorizontalAxisBead.prototyp
minimum: {
get: function() {}
}
-});
\ No newline at end of file
+});
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/Charts/js/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/js/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js b/frameworks/projects/Charts/js/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js
index 14d03a4..be8ba80 100644
--- a/frameworks/projects/Charts/js/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js
+++ b/frameworks/projects/Charts/js/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js
@@ -15,13 +15,13 @@
goog.provide('org_apache_flex_charts_supportClasses_ChartDataGroup');
goog.require('org_apache_flex_charts_core_IChartDataGroup');
-goog.require('org_apache_flex_html_supportClasses_NonVirtualDataGroup');
+goog.require('org_apache_flex_html_supportClasses_DataGroup');
/**
* @constructor
- * @extends {org_apache_flex_html_supportClasses_NonVirtualDataGroup}
+ * @extends {org_apache_flex_html_supportClasses_DataGroup}
* @implements {org_apache_flex_charts_core_IChartDataGroup}
*/
org_apache_flex_charts_supportClasses_ChartDataGroup =
@@ -30,7 +30,7 @@ org_apache_flex_charts_supportClasses_ChartDataGroup =
};
goog.inherits(
org_apache_flex_charts_supportClasses_ChartDataGroup,
- org_apache_flex_html_supportClasses_NonVirtualDataGroup);
+ org_apache_flex_html_supportClasses_DataGroup);
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/defaults.css b/frameworks/projects/HTML/as/defaults.css
index f59ea8f..8ee8b40 100644
--- a/frameworks/projects/HTML/as/defaults.css
+++ b/frameworks/projects/HTML/as/defaults.css
@@ -72,7 +72,7 @@ ButtonBar
IBeadView: ClassReference("org.apache.flex.html.beads.ButtonBarView");
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
- IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
+ IDataGroup: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer");
@@ -102,7 +102,7 @@ ControlBar
HContainer
{
IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
}
ImageButton
@@ -113,7 +113,7 @@ ImageButton
VContainer
{
IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalLayout");
}
List
@@ -121,8 +121,8 @@ List
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadView: ClassReference("org.apache.flex.html.beads.ListView");
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
- IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalScrollingLayout");
+ IDataGroup: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
@@ -155,8 +155,8 @@ SimpleList
IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadView: ClassReference("org.apache.flex.html.beads.ListView");
IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
- IDataGroup: ClassReference("org.apache.flex.html.supportClasses.NonVirtualDataGroup");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VerticalScrollingLayout");
+ IDataGroup: ClassReference("org.apache.flex.html.supportClasses.DataGroup");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
@@ -242,7 +242,7 @@ Container
ControlBar
{
- IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.HorizontalLayout");
iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/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 21cea7f..d508c82 100644
--- a/frameworks/projects/HTML/as/src/HTMLClasses.as
+++ b/frameworks/projects/HTML/as/src/HTMLClasses.as
@@ -89,14 +89,14 @@ internal class HTMLClasses
import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController;
import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController;
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.NonVirtualBasicLayout; NonVirtualBasicLayout;
+ import org.apache.flex.html.beads.layouts.VerticalScrollingLayout; VerticalScrollingLayout;
+ import org.apache.flex.html.beads.layouts.HorizontalScrollingLayout; HorizontalScrollingLayout;
+ import org.apache.flex.html.beads.layouts.BasicLayout; BasicLayout;
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;
import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData;
- import org.apache.flex.html.supportClasses.NonVirtualDataGroup; NonVirtualDataGroup;
+ import org.apache.flex.html.supportClasses.DataGroup; DataGroup;
import org.apache.flex.events.CustomEvent; CustomEvent;
import org.apache.flex.events.Event; Event;
import org.apache.flex.events.MouseEvent; MouseEvent;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/HContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/HContainer.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/HContainer.as
index aa66c2a..a4a8985 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/HContainer.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/HContainer.as
@@ -30,13 +30,13 @@ package org.apache.flex.html
[DefaultProperty("mxmlContent")]
/**
- * A Container that has a NonVirtualHorizontalLayout.
+ * A Container that has a HorizontalLayout.
*
* This is effectively the same as the pattern
* <code>
* <basic:Container xmlns:basic="library://ns.apache.org/flexjs/basic">
* <basic:layout>
- * <basic:NonVirtualHorizontalLayout />
+ * <basic:HorizontalLayout />
* </basic:layout>
* </basic:Container>
* </code>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/VContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/VContainer.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/VContainer.as
index 1544898..75eb89a 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/VContainer.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/VContainer.as
@@ -30,13 +30,13 @@ package org.apache.flex.html
[DefaultProperty("mxmlContent")]
/**
- * A Container that has a NonVirtualVerticalLayout.
+ * A Container that has a VerticalLayout.
*
* This is effectively the same as the pattern
* <code>
* <basic:Container xmlns:basic="library://ns.apache.org/flexjs/basic">
* <basic:layout>
- * <basic:NonVirtualVerticalLayout />
+ * <basic:VerticalLayout />
* </basic:layout>
* </basic:Container>
* </code>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
index afe8a0b..7b14d2a 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads
import org.apache.flex.html.beads.models.ScrollBarModel;
import org.apache.flex.html.beads.models.SingleLineBorderModel;
import org.apache.flex.html.supportClasses.Border;
- import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
+ import org.apache.flex.html.supportClasses.DataGroup;
import org.apache.flex.html.supportClasses.ScrollBar;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as
index 1fe3c29..4e93375 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads
import org.apache.flex.html.beads.models.ScrollBarModel;
import org.apache.flex.html.beads.models.SingleLineBorderModel;
import org.apache.flex.html.supportClasses.Border;
- import org.apache.flex.html.supportClasses.NonVirtualDataGroup;
+ import org.apache.flex.html.supportClasses.DataGroup;
import org.apache.flex.html.supportClasses.ScrollBar;
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
index 66f2531..8d14f59 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/NumericStepperView.as
@@ -32,7 +32,7 @@ package org.apache.flex.html.beads
import org.apache.flex.html.Label;
import org.apache.flex.html.Spinner;
import org.apache.flex.html.TextInput;
- import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+ import org.apache.flex.html.beads.layouts.HorizontalLayout;
import org.apache.flex.html.supportClasses.Border;
import org.apache.flex.html.supportClasses.ScrollBar;
@@ -78,7 +78,7 @@ package org.apache.flex.html.beads
super.strand = value;
// add a horizontal layout bead
- value.addBead(new NonVirtualHorizontalLayout());
+ value.addBead(new HorizontalLayout());
// add an input field
input = new TextInput();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
index 521f177..f0ff2a6 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicLayout.as
@@ -31,7 +31,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.utils.dbg.DOMPathUtil;
/**
- * The NonVirtualBasicLayout class is a simple layout
+ * The BasicLayout class is a simple layout
* bead. It takes the set of children and lays them out
* as specified by CSS properties like left, right, top
* and bottom.
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualBasicLayout implements IBeadLayout
+ public class BasicLayout implements IBeadLayout
{
/**
* Constructor.
@@ -51,7 +51,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualBasicLayout()
+ public function BasicLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.as
index c0bce33..de7ee78 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.as
@@ -38,7 +38,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.html.supportClasses.ScrollBar;
/**
- * The NonVirtualBasicLayout class is a simple layout
+ * The BasicLayout class is a simple layout
* bead. It takes the set of children and lays them out
* as specified by CSS properties like left, right, top
* and bottom, and puts up a scrollbar if needed.
@@ -48,7 +48,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualBasicScrollingLayout implements IBeadLayout
+ public class BasicScrollingLayout implements IBeadLayout
{
/**
* Constructor.
@@ -58,7 +58,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualBasicScrollingLayout()
+ public function BasicScrollingLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
index 7316f41..8bbf420 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalLayout.as
@@ -30,7 +30,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.utils.dbg.DOMPathUtil;
/**
- * The NonVirtualHorizontalLayout class is a simple layout
+ * The HorizontalLayout class is a simple layout
* bead. It takes the set of children and lays them out
* horizontally in one row, separating them according to
* CSS layout rules for margin and vertical-align styles.
@@ -40,7 +40,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualHorizontalLayout implements IBeadLayout
+ public class HorizontalLayout implements IBeadLayout
{
/**
* Constructor.
@@ -50,7 +50,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualHorizontalLayout()
+ public function HorizontalLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalScrollingLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalScrollingLayout.as
index b3e2e92..1e19e48 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalScrollingLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/HorizontalScrollingLayout.as
@@ -30,7 +30,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.html.supportClasses.ScrollBar;
/**
- * The NonVirtualHorizontalScrollingLayout class is a layout
+ * The HorizontalScrollingLayout class is a layout
* bead that displays a set of children horizontally in one row,
* separating them according to CSS layout rules for margin and
* vertical-align styles and lays out a horizontal ScrollBar
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualHorizontalScrollingLayout implements IBeadLayout
+ public class HorizontalScrollingLayout implements IBeadLayout
{
/**
* Constructor.
@@ -51,7 +51,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualHorizontalScrollingLayout()
+ public function HorizontalScrollingLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
index f45ca3e..a8a5558 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalLayout.as
@@ -31,7 +31,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.utils.dbg.DOMPathUtil;
/**
- * The NonVirtualVerticalLayout class is a simple layout
+ * The VerticalLayout class is a simple layout
* bead. It takes the set of children and lays them out
* vertically in one column, separating them according to
* CSS layout rules for margin and horizontal-align styles.
@@ -41,7 +41,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualVerticalLayout implements IBeadLayout
+ public class VerticalLayout implements IBeadLayout
{
/**
* Constructor.
@@ -51,7 +51,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualVerticalLayout()
+ public function VerticalLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.as
index c9408f9..58a6f59 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VerticalScrollingLayout.as
@@ -36,7 +36,7 @@ package org.apache.flex.html.beads.layouts
import org.apache.flex.html.supportClasses.ScrollBar;
/**
- * The NonVirtualVerticalScrollingLayout class is a layout
+ * The VerticalScrollingLayout class is a layout
* bead that displays a set of children vertically in one row,
* separating them according to CSS layout rules for margin and
* vertical-align styles and lays out a vertical ScrollBar
@@ -47,7 +47,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualVerticalScrollingLayout implements IBeadLayout
+ public class VerticalScrollingLayout implements IBeadLayout
{
/**
* Constructor.
@@ -57,7 +57,7 @@ package org.apache.flex.html.beads.layouts
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualVerticalScrollingLayout()
+ public function VerticalScrollingLayout()
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DataGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DataGroup.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DataGroup.as
index 8487618..5725f2c 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DataGroup.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DataGroup.as
@@ -24,7 +24,7 @@ package org.apache.flex.html.supportClasses
import org.apache.flex.core.UIBase;
/**
- * The NonVirtualDataGroup class is the IItemRendererParent used internally
+ * The DataGroup class is the IItemRendererParent used internally
* by org.apache.flex.html.List class.
*
* @langversion 3.0
@@ -32,7 +32,7 @@ package org.apache.flex.html.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class NonVirtualDataGroup extends UIBase implements IItemRendererParent, IContentView
+ public class DataGroup extends UIBase implements IItemRendererParent, IContentView
{
/**
* Constructor.
@@ -42,7 +42,7 @@ package org.apache.flex.html.supportClasses
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public function NonVirtualDataGroup()
+ public function DataGroup()
{
super();
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/basic-manifest.xml b/frameworks/projects/HTML/basic-manifest.xml
index 1d789f3..bf669c9 100644
--- a/frameworks/projects/HTML/basic-manifest.xml
+++ b/frameworks/projects/HTML/basic-manifest.xml
@@ -50,12 +50,12 @@
<component id="TitleBar" class="org.apache.flex.html.TitleBar"/>
<component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"/>
<component id="ToolTip" class="org.apache.flex.html.ToolTip"/>
- <component id="NonVirtualBasicLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicLayout"/>
- <component id="NonVirtualBasicScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualBasicScrollingLayout"/>
- <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"/>
- <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout"/>
- <component id="NonVirtualVerticalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout"/>
- <component id="NonVirtualHorizontalScrollingLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout"/>
+ <component id="BasicLayout" class="org.apache.flex.html.beads.layouts.BasicLayout"/>
+ <component id="BasicScrollingLayout" class="org.apache.flex.html.beads.layouts.BasicScrollingLayout"/>
+ <component id="VerticalLayout" class="org.apache.flex.html.beads.layouts.VerticalLayout"/>
+ <component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout"/>
+ <component id="VerticalScrollingLayout" class="org.apache.flex.html.beads.layouts.VerticalScrollingLayout"/>
+ <component id="HorizontalScrollingLayout" class="org.apache.flex.html.beads.layouts.HorizontalScrollingLayout"/>
<component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
<component id="ListView" class="org.apache.flex.html.beads.ListView"/>
<component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/ButtonBar.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/ButtonBar.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/ButtonBar.js
index d01b39f..05c7e1b 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/ButtonBar.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/ButtonBar.js
@@ -17,7 +17,7 @@ goog.provide('org_apache_flex_html_ButtonBar');
goog.require('org_apache_flex_core_ListBase');
goog.require('org_apache_flex_html_List');
goog.require('org_apache_flex_html_beads_DataItemRendererFactoryForArrayData');
-goog.require('org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout');
+goog.require('org_apache_flex_html_beads_layouts_HorizontalLayout');
goog.require('org_apache_flex_html_supportClasses_ButtonBarButtonItemRenderer');
@@ -38,7 +38,7 @@ org_apache_flex_html_ButtonBar = function() {
// org_apache_flex_html_beads_ListView());
// this.addBead(new
- //org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout());
+ //org_apache_flex_html_beads_layouts_HorizontalLayout());
// this.itemRendererFactory = new
// org_apache_flex_html_beads_
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
index 6f7cc65..bf9a3b7 100644
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/ListView.js
@@ -22,7 +22,7 @@ goog.require('org_apache_flex_core_ValuesManager');
goog.require('org_apache_flex_html_beads_IListView');
goog.require('org_apache_flex_html_beads_TextItemRendererFactoryForArrayData');
goog.require('org_apache_flex_html_beads_models_ArraySelectionModel');
-goog.require('org_apache_flex_html_supportClasses_NonVirtualDataGroup');
+goog.require('org_apache_flex_html_supportClasses_DataGroup');
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
new file mode 100644
index 0000000..9126b28
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicLayout.js
@@ -0,0 +1,134 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org_apache_flex_html_beads_layouts_BasicLayout');
+
+goog.require('org_apache_flex_core_IBeadLayout');
+goog.require('org_apache_flex_core_ILayoutChild');
+goog.require('org_apache_flex_core_ValuesManager');
+goog.require('org_apache_flex_utils_Language');
+
+
+
+/**
+ * @constructor
+ * @implements {org_apache_flex_core_IBeadLayout}
+ */
+org_apache_flex_html_beads_layouts_BasicLayout =
+ function() {
+ this.strand_ = null;
+ this.className = 'BasicLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_beads_layouts_BasicLayout.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'BasicLayout',
+ qName: 'org_apache_flex_html_beads_layouts_BasicLayout'}],
+ interfaces: [org_apache_flex_core_IBeadLayout] };
+
+
+Object.defineProperties(org_apache_flex_html_beads_layouts_BasicLayout.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_beads_layouts_BasicLayout} */
+ set: function(value) {
+ if (this.strand_ !== value) {
+ this.strand_ = value;
+ if (this.strand_.isWidthSizedToContent() &&
+ this.strand_.isHeightSizedToContent())
+ this.addOtherListeners();
+ else {
+ this.strand_.addEventListener('heightChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('widthChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('sizeChanged',
+ goog.bind(this.sizeChangeHandler, this));
+
+ this.addOtherListeners();
+ }
+ }
+ }
+ }
+});
+
+
+/**
+ *
+ */
+org_apache_flex_html_beads_layouts_BasicLayout.
+ prototype.addOtherListeners = function() {
+ this.strand_.addEventListener('childrenAdded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('layoutNeeded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('itemsCreated',
+ goog.bind(this.changeHandler, this));
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The event.
+ */
+org_apache_flex_html_beads_layouts_BasicLayout.
+ prototype.sizeChangeHandler = function(event) {
+ this.addOtherListeners();
+ this.changeHandler(event);
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The text getter.
+ */
+org_apache_flex_html_beads_layouts_BasicLayout.
+ prototype.changeHandler = function(event) {
+ var i, n, h, w;
+
+ var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent);
+ var contentView = viewBead.contentView;
+ w = contentView.width;
+ h = contentView.height;
+ n = contentView.numElements;
+ for (i = 0; i < n; i++) {
+ var child = contentView.getElementAt(i);
+ child.positioner.internalDisplay = 'block';
+ var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left');
+ var right = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'right');
+ var top = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'top');
+ var bottom = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'bottom');
+
+ if (!isNaN(left)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.left = left.toString() + 'px';
+ }
+ if (!isNaN(top)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.top = top.toString() + 'px';
+ }
+ if (!isNaN(right)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.right = right.toString() + 'px';
+ }
+ if (!isNaN(bottom)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.bottom = bottom.toString() + 'px';
+ }
+ child.dispatchEvent('sizeChanged');
+ }
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.js
new file mode 100644
index 0000000..86c51a2
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/BasicScrollingLayout.js
@@ -0,0 +1,99 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org_apache_flex_html_beads_layouts_BasicScrollingLayout');
+
+goog.require('org_apache_flex_core_IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org_apache_flex_core_IBeadLayout}
+ */
+org_apache_flex_html_beads_layouts_BasicScrollingLayout =
+ function() {
+ this.strand_ = null;
+ this.className = 'BasicScrollingLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_beads_layouts_BasicScrollingLayout.prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'BasicScrollingLayout',
+ qName: 'org_apache_flex_html_beads_layouts_BasicScrollingLayout'}],
+ interfaces: [org_apache_flex_core_IBeadLayout] };
+
+
+Object.defineProperties(org_apache_flex_html_beads_layouts_BasicScrollingLayout.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_beads_layouts_BasicScrollingLayout} */
+ set: function(value) {
+ if (this.strand_ !== value) {
+ this.strand_ = value;
+ this.strand_.addEventListener('childrenAdded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('layoutNeeded',
+ goog.bind(this.changeHandler, this));
+ }
+ }
+ }
+});
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The text getter.
+ */
+org_apache_flex_html_beads_layouts_BasicScrollingLayout.
+ prototype.changeHandler = function(event) {
+ var i, n, h, w;
+
+ var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent);
+ var contentView = viewBead.contentView;
+ contentView.element.style.overflow = 'auto';
+ w = contentView.width;
+ h = contentView.height;
+ n = contentView.numElements;
+ for (i = 0; i < n; i++) {
+ var child = contentView.getElementAt(i);
+ child.positioner.internalDisplay = 'block';
+ var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left');
+ var right = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'right');
+ var top = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'top');
+ var bottom = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'bottom');
+
+ if (!isNaN(left)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.left = left.toString() + 'px';
+ }
+ if (!isNaN(top)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.top = top.toString() + 'px';
+ }
+ if (!isNaN(right)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.right = right.toString() + 'px';
+ }
+ if (!isNaN(bottom)) {
+ child.positioner.style.position = 'absolute';
+ child.positioner.style.bottom = bottom.toString() + 'px';
+ }
+ child.dispatchEvent('sizeChanged');
+ }
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
new file mode 100644
index 0000000..55d4fb0
--- /dev/null
+++ b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/HorizontalLayout.js
@@ -0,0 +1,116 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+goog.provide('org_apache_flex_html_beads_layouts_HorizontalLayout');
+
+goog.require('org_apache_flex_core_IBeadLayout');
+
+
+
+/**
+ * @constructor
+ * @implements {org_apache_flex_core_IBeadLayout}
+ */
+org_apache_flex_html_beads_layouts_HorizontalLayout =
+ function() {
+ this.strand_ = null;
+ this.className = 'HorizontalLayout';
+};
+
+
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+org_apache_flex_html_beads_layouts_HorizontalLayout.
+ prototype.FLEXJS_CLASS_INFO =
+ { names: [{ name: 'HorizontalLayout',
+ qName: 'org_apache_flex_html_beads_layouts_HorizontalLayout' }],
+ interfaces: [org_apache_flex_core_IBeadLayout] };
+
+
+Object.defineProperties(org_apache_flex_html_beads_layouts_HorizontalLayout.prototype, {
+ /** @expose */
+ strand: {
+ /** @this {org_apache_flex_html_beads_layouts_HorizontalLayout} */
+ set: function(value) {
+ if (this.strand_ !== value) {
+ this.strand_ = value;
+ if (this.strand_.isWidthSizedToContent() &&
+ this.strand_.isHeightSizedToContent())
+ this.addOtherListeners();
+ else {
+ this.strand_.addEventListener('heightChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('widthChanged',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('sizeChanged',
+ goog.bind(this.sizeChangeHandler, this));
+ if (!isNaN(this.strand_.explicitWidth) &&
+ !isNaN(this.strand_.explicitHeight))
+ this.addOtherListeners();
+ }
+ this.strand_.element.style.display = 'block';
+ }
+ }
+ }
+});
+
+
+/**
+ *
+ */
+org_apache_flex_html_beads_layouts_HorizontalLayout.
+ prototype.addOtherListeners = function() {
+ this.strand_.addEventListener('childrenAdded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('layoutNeeded',
+ goog.bind(this.changeHandler, this));
+ this.strand_.addEventListener('itemsCreated',
+ goog.bind(this.changeHandler, this));
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The event.
+ */
+org_apache_flex_html_beads_layouts_HorizontalLayout.
+ prototype.sizeChangeHandler = function(event) {
+ this.addOtherListeners();
+ this.changeHandler(event);
+};
+
+
+/**
+ * @param {org_apache_flex_events_Event} event The text getter.
+ */
+org_apache_flex_html_beads_layouts_HorizontalLayout.
+ prototype.changeHandler = function(event) {
+ var children, i, n;
+
+ children = this.strand_.internalChildren();
+ n = children.length;
+ for (i = 0; i < n; i++)
+ {
+ var child = children[i];
+ child.internalDisplay = 'inline-block';
+ if (child.style.display == 'none')
+ child.lastDisplay_ = 'inline-block';
+ else
+ child.style.display = 'inline-block';
+ child.style.verticalAlign = 'middle';
+ child.flexjs_wrapper.dispatchEvent('sizeChanged');
+ }
+};
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ba378c00/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js b/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
deleted file mode 100644
index 73ae4db..0000000
--- a/frameworks/projects/HTML/js/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org_apache_flex_html_beads_layouts_NonVirtualBasicLayout');
-
-goog.require('org_apache_flex_core_IBeadLayout');
-goog.require('org_apache_flex_core_ILayoutChild');
-goog.require('org_apache_flex_core_ValuesManager');
-goog.require('org_apache_flex_utils_Language');
-
-
-
-/**
- * @constructor
- * @implements {org_apache_flex_core_IBeadLayout}
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicLayout =
- function() {
- this.strand_ = null;
- this.className = 'NonVirtualBasicLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicLayout.prototype.FLEXJS_CLASS_INFO =
- { names: [{ name: 'NonVirtualBasicLayout',
- qName: 'org_apache_flex_html_beads_layouts_NonVirtualBasicLayout'}],
- interfaces: [org_apache_flex_core_IBeadLayout] };
-
-
-Object.defineProperties(org_apache_flex_html_beads_layouts_NonVirtualBasicLayout.prototype, {
- /** @expose */
- strand: {
- /** @this {org_apache_flex_html_beads_layouts_NonVirtualBasicLayout} */
- set: function(value) {
- if (this.strand_ !== value) {
- this.strand_ = value;
- if (this.strand_.isWidthSizedToContent() &&
- this.strand_.isHeightSizedToContent())
- this.addOtherListeners();
- else {
- this.strand_.addEventListener('heightChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('widthChanged',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('sizeChanged',
- goog.bind(this.sizeChangeHandler, this));
-
- this.addOtherListeners();
- }
- }
- }
- }
-});
-
-
-/**
- *
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicLayout.
- prototype.addOtherListeners = function() {
- this.strand_.addEventListener('childrenAdded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('layoutNeeded',
- goog.bind(this.changeHandler, this));
- this.strand_.addEventListener('itemsCreated',
- goog.bind(this.changeHandler, this));
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The event.
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicLayout.
- prototype.sizeChangeHandler = function(event) {
- this.addOtherListeners();
- this.changeHandler(event);
-};
-
-
-/**
- * @param {org_apache_flex_events_Event} event The text getter.
- */
-org_apache_flex_html_beads_layouts_NonVirtualBasicLayout.
- prototype.changeHandler = function(event) {
- var i, n, h, w;
-
- var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent);
- var contentView = viewBead.contentView;
- w = contentView.width;
- h = contentView.height;
- n = contentView.numElements;
- for (i = 0; i < n; i++) {
- var child = contentView.getElementAt(i);
- child.positioner.internalDisplay = 'block';
- var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left');
- var right = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'right');
- var top = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'top');
- var bottom = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'bottom');
-
- if (!isNaN(left)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.left = left.toString() + 'px';
- }
- if (!isNaN(top)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.top = top.toString() + 'px';
- }
- if (!isNaN(right)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.right = right.toString() + 'px';
- }
- if (!isNaN(bottom)) {
- child.positioner.style.position = 'absolute';
- child.positioner.style.bottom = bottom.toString() + 'px';
- }
- child.dispatchEvent('sizeChanged');
- }
-};