This is an automated email from the ASF dual-hosted git repository. aharui pushed a commit to branch feature/MXRoyale in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a7230ce1c5cd57fab234241b2c963f5e49bdb047 Author: Alex Harui <[email protected]> AuthorDate: Thu May 10 15:33:25 2018 -0700 fix up Jewel and MDL Lists after IList refactor --- .../main/royale/org/apache/royale/jewel/List.as | 19 ++++--- .../royale/org/apache/royale/mdl/DropDownList.as | 27 --------- .../src/main/royale/org/apache/royale/mdl/Table.as | 65 ---------------------- .../TabsDataItemRendererFactoryForArrayListData.as | 13 +++-- 4 files changed, 17 insertions(+), 107 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as index ed83f5f..eb9cb0b 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as @@ -18,9 +18,10 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.royale.jewel { + import org.apache.royale.core.IListPresentationModel; import org.apache.royale.core.IRollOverModel; import org.apache.royale.core.ISelectionModel; - import org.apache.royale.html.DataContainer; + import org.apache.royale.html.DataContainer; COMPILE::JS @@ -134,14 +135,14 @@ package org.apache.royale.jewel * @playerversion AIR 2.6 * @productversion Royale 0.9.3 */ - public function get rowHeight():Number - { - return presentationModel.rowHeight; - } - public function set rowHeight(value:Number):void - { - presentationModel.rowHeight = value; - } + public function get rowHeight():Number + { + return (presentationModel as IListPresentationModel).rowHeight; + } + public function set rowHeight(value:Number):void + { + (presentationModel as IListPresentationModel).rowHeight = value; + } /** * The item currently selected. Changing this value also diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/DropDownList.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/DropDownList.as index 89a68f7..9ae2b04 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/DropDownList.as +++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/DropDownList.as @@ -171,33 +171,6 @@ package org.apache.royale.mdl ISelectionModel(model).selectedItem = value; } - override public function removeAllItemRenderers():void - { - COMPILE::JS - { - var optionsCount:int = dropDown.numElements; - - for (var i:int = 1; i < optionsCount; i++) - { - var item:UIBase = dropDown.getElementAt(i) as UIBase; - dropDown.removeElement(item); - } - } - } - - override public function addItemRenderer(renderer:IItemRenderer, dispatchAdded:Boolean):void - { - COMPILE::JS - { - dropDown.addElement(renderer, dispatchAdded); - } - - var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded"); - newEvent.item = renderer; - - dispatchEvent(newEvent); - } - /** * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement */ diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Table.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Table.as index 81915fe..1d00c51 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Table.as +++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/Table.as @@ -178,71 +178,6 @@ package org.apache.royale.mdl } } - /** - * @copy org.apache.royale.core.IItemRendererParent#removeAllItemRenderers() - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - override public function removeAllItemRenderers():void - { - if (!_isTbodyAddedToParent) return; - - COMPILE::JS - { - while (tbody.numElements) - { - var child:IChild = tbody.getElementAt(0); - removeElement(child); - } - } - } - - /** - * @copy org.apache.royale.core.IItemRendererParent#removeItemRenderer() - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - override public function removeItemRenderer(renderer:IItemRenderer):void - { - if (!_isTbodyAddedToParent) return; - - COMPILE::JS - { - removeElement(renderer); - } - } - - /** - * @copy org.apache.royale.core.IItemRendererParent#getItemRendererForIndex() - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - override public function getItemRendererForIndex(index:int):IItemRenderer - { - if (!_isTbodyAddedToParent) return null; - var itemRenderer:IItemRenderer; - - COMPILE::JS - { - if (index < 0 || index >= tbody.numElements) - { - return null; - } - - itemRenderer = tbody.getElementAt(index) as IItemRenderer; - } - - return itemRenderer; - } COMPILE::JS private var thead:Thead; diff --git a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as index c6b55ed..ad765fa 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as +++ b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/beads/TabsDataItemRendererFactoryForArrayListData.as @@ -20,17 +20,17 @@ package org.apache.royale.mdl.beads { import org.apache.royale.collections.IArrayList; import org.apache.royale.core.IItemRendererParent; - import org.apache.royale.core.IList; import org.apache.royale.core.IListPresentationModel; + import org.apache.royale.core.IStrandWithModelView; import org.apache.royale.core.SimpleCSSStyles; import org.apache.royale.core.UIBase; - + import org.apache.royale.events.Event; import org.apache.royale.events.IEventDispatcher; import org.apache.royale.html.beads.DataItemRendererFactoryForArrayList; + import org.apache.royale.html.beads.IListView; import org.apache.royale.html.supportClasses.DataItemRenderer; import org.apache.royale.mdl.beads.models.ITabModel; import org.apache.royale.mdl.supportClasses.ITabItemRenderer; - import org.apache.royale.events.Event; /** * The TabsDataItemRendererFactoryForArrayListData class reads an @@ -69,7 +69,8 @@ package org.apache.royale.mdl.beads /** * @royaleignorecoercion org.apache.royale.core.UIBase - * @royaleignorecoercion org.apache.royale.core.IList + * @royaleignorecoercion org.apache.royale.core.IStrandWithModelView + * @royaleignorecoercion org.apache.royale.html.beads.IListView * @royaleignorecoercion org.apache.royale.core.IListPresentationModel * @royaleignorecoercion org.apache.royale.events.IEventDispatcher * @royaleignorecoercion org.apache.royale.html.supportClasses.DataItemRenderer @@ -81,8 +82,8 @@ package org.apache.royale.mdl.beads if (!dp) return; - var list:IList = _strand as IList; - var dataGroup:IItemRendererParent = list.dataGroup; + var view:IListView = (_strand as IStrandWithModelView).view as IListView; + var dataGroup:IItemRendererParent = view.dataGroup; dataGroup.removeAllItemRenderers(); -- To stop receiving notification emails like this one, please contact [email protected].
