Repairs to MDL project to sync with changes made to Core and HTML projects.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d1d27547 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d1d27547 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d1d27547 Branch: refs/heads/tlf Commit: d1d2754776b8e57db02faad30e63fa68fdd997ce Parents: 4011d64 Author: Peter Ent <[email protected]> Authored: Fri Mar 24 08:20:18 2017 -0400 Committer: Peter Ent <[email protected]> Committed: Fri Mar 24 08:20:18 2017 -0400 ---------------------------------------------------------------------- frameworks/build.xml | 4 +- .../main/flex/org/apache/flex/core/GroupBase.as | 19 +++++- .../src/main/flex/org/apache/flex/mdl/Card.as | 32 ++++----- .../src/main/flex/org/apache/flex/mdl/Dialog.as | 20 +++--- .../flex/org/apache/flex/mdl/DialogActions.as | 12 ++-- .../flex/org/apache/flex/mdl/DialogContent.as | 16 ++--- .../src/main/flex/org/apache/flex/mdl/Drawer.as | 12 ++-- .../src/main/flex/org/apache/flex/mdl/Footer.as | 16 ++--- .../org/apache/flex/mdl/FooterBottomSection.as | 20 +++--- .../apache/flex/mdl/FooterDropDownSection.as | 24 +++---- .../org/apache/flex/mdl/FooterLeftSection.as | 22 +++--- .../org/apache/flex/mdl/FooterMiddleSection.as | 22 +++--- .../org/apache/flex/mdl/FooterRightSection.as | 22 +++--- .../org/apache/flex/mdl/FooterTopSection.as | 20 +++--- .../src/main/flex/org/apache/flex/mdl/Grid.as | 18 ++--- .../main/flex/org/apache/flex/mdl/GridCell.as | 72 ++++++++++---------- .../src/main/flex/org/apache/flex/mdl/Header.as | 14 ++-- .../main/flex/org/apache/flex/mdl/HeaderRow.as | 12 ++-- .../src/main/flex/org/apache/flex/mdl/List.as | 57 +++++++++++++++- .../main/flex/org/apache/flex/mdl/Navigation.as | 16 ++--- .../org/apache/flex/mdl/NavigationLayout.as | 16 ++--- .../apache/flex/mdl/NavigationLayoutContent.as | 14 ++-- .../src/main/flex/org/apache/flex/mdl/THead.as | 14 ++-- .../flex/org/apache/flex/mdl/TabBarPanel.as | 26 +++---- .../main/flex/org/apache/flex/mdl/TableCell.as | 24 +++---- .../flex/org/apache/flex/mdl/TableColumn.as | 26 +++---- .../apache/flex/mdl/supportClasses/CardInner.as | 16 ++--- 27 files changed, 329 insertions(+), 257 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/build.xml b/frameworks/build.xml index 961f9cf..aea5ea2 100644 --- a/frameworks/build.xml +++ b/frameworks/build.xml @@ -85,7 +85,7 @@ <antcall target="Effects"/> <!-- <antcall target="Basic"/> --> <antcall target="Flat"/> - <!--<antcall target="Charts"/>--> + <antcall target="Charts"/> <antcall target="DragDrop"/> <antcall target="Formatters"/> <antcall target="GoogleMaps"/> @@ -97,7 +97,7 @@ <antcall target="Reflection"/> <antcall target="Storage"/> <antcall target="XML"/> - <!--<antcall target="MaterialDesignLite"/>--> + <antcall target="MaterialDesignLite"/> <antcall target="FontAwesome"/> <antcall target="Express"/> </target> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as index f36b938..18662ec 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/GroupBase.as @@ -19,6 +19,7 @@ package org.apache.flex.core { import org.apache.flex.core.IMXMLDocument; + import org.apache.flex.core.IContentViewHost; import org.apache.flex.core.ValuesManager; import org.apache.flex.events.Event; import org.apache.flex.events.ValueChangeEvent; @@ -75,7 +76,7 @@ package org.apache.flex.core * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class GroupBase extends UIBase implements IMXMLDocument, IStatesObject + public class GroupBase extends UIBase implements IMXMLDocument, IStatesObject, IContentViewHost { /** * Constructor. @@ -112,6 +113,9 @@ package org.apache.flex.core dispatchEvent(new Event("childrenAdded")); } + /** + * @private + */ override public function addedToParent():void { if (!_initialized) @@ -133,6 +137,19 @@ package org.apache.flex.core childrenAdded(); } } + + /** + * @copy org.apache.flex.core.IContentViewHost#strandChildren + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.8 + */ + public function get strandChildren():IParent + { + return this; + } private var _mxmlDescriptor:Array; private var _mxmlDocument:Object = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as index 47d92e8..e3bfabd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Card.as @@ -18,25 +18,25 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Card class is a self-contained pieces of paper with data. - * The Material Design Lite (MDL) card component is a user interface element - * representing a virtual piece of paper that contains related data â such as a + * The Material Design Lite (MDL) card component is a user interface element + * representing a virtual piece of paper that contains related data â such as a * photo, some text, and a link â that are all about a single subject. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Card extends ContainerBase + public class Card extends Group { /** * constructor. @@ -52,7 +52,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -62,22 +62,22 @@ package org.apache.flex.mdl typeNames = "mdl-card"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; return element; } - + protected var _shadow:Number = 0; /** * A boolean flag to activate "mdl-shadow--Xdp" effect selector. * Assigns variable shadow depths (0, 2, 3, 4, 6, 8, or 16) to card - * - * Cards are a convenient means of coherently displaying related content - * that is composed of different types of objects. They are also well-suited - * for presenting similar objects whose size or supported actions can vary - * considerably, like photos with captions of variable length. Cards have + * + * Cards are a convenient means of coherently displaying related content + * that is composed of different types of objects. They are also well-suited + * for presenting similar objects whose size or supported actions can vary + * considerably, like photos with captions of variable length. Cards have * a constant width and a variable height, depending on their content. * * @langversion 3.0 @@ -94,7 +94,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-shadow--" + _shadow + "dp"); - + if(value == 2 || value == 3 || value == 4 || value == 6 || value == 8 || value == 16) { _shadow = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as index cbe88aa..8ba2019 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Dialog.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.Application; import org.apache.flex.core.IPopUp; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The MDL Dialog class creates modal windows for dedicated user input. - * The Material Design Lite (MDL) dialog component allows for verification of user actions, simple data input, + * The Material Design Lite (MDL) dialog component allows for verification of user actions, simple data input, * and alerts to provide extra information to users. * * Note: Dialogs use the HTML <dialog> element, which currently has very limited cross-browser support. * To ensure support across all modern browsers, we use use dialogPolyfill extern or creating your own. * There is no polyfill included with MDL. - * + * * Use DialogContent to insert content and DialogActions for the buttons to allow user interaction * * @langversion 3.0 @@ -43,11 +43,11 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Dialog extends ContainerBase implements IPopUp + public class Dialog extends Group implements IPopUp { /** * constructor. - * + * * <inject_html> * <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.5/dialog-polyfill.min.css";> * <script src="https://cdnjs.cloudflare.com/ajax/libs/dialog-polyfill/0.4.5/dialog-polyfill.min.js";></script> @@ -79,7 +79,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-dialog"; - + dialog = document.createElement('dialog') as HTMLDialogElement; element = dialog as WrappedHTMLElement; @@ -130,7 +130,7 @@ package org.apache.flex.mdl * @productversion FlexJS 0.8 */ public function showModal():void - { + { prepareDialog(); COMPILE::JS @@ -138,7 +138,7 @@ package org.apache.flex.mdl dialog.showModal() } } - + /** * show dialog. * Note: It seems MDL does not support non modal dialogs, since there's no examples http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogActions.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogActions.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogActions.as index ed13a7d..2140ae9 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogActions.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogActions.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The DialogActions class is a container to use inside Dialog class * that holds buttons or other components to perform user actions @@ -34,7 +34,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class DialogActions extends ContainerBase + public class DialogActions extends Group { /** * constructor. @@ -50,7 +50,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -58,7 +58,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-dialog__actions"; - + element = document.createElement('div') as WrappedHTMLElement; positioner = element; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogContent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogContent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogContent.as index 633863b..493d1ad 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogContent.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/DialogContent.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The DialogContent class is a container to use inside Dialog class * that holds content and information so the user gets notified and @@ -35,11 +35,11 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class DialogContent extends ContainerBase + public class DialogContent extends Group { /** * constructor. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -59,9 +59,9 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { typeNames = "mdl-dialog__content"; - + element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Drawer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Drawer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Drawer.as index 36f2af8..e458d2d 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Drawer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Drawer.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Drawer class is a container component used for navigation * in smaller screens. Can appear automatically in smaller screens @@ -36,7 +36,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Drawer extends ContainerBase + public class Drawer extends Group { /** * constructor. @@ -52,7 +52,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -62,7 +62,7 @@ package org.apache.flex.mdl typeNames = "mdl-layout__drawer"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as index ca493e1..6c37da3 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Footer.as @@ -18,23 +18,23 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Footer class is a Container component capable of parenting other - * components - * + * components + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Footer extends ContainerBase + public class Footer extends Group { /** * constructor. @@ -50,7 +50,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -60,7 +60,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer"; element = document.createElement('footer') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterBottomSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterBottomSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterBottomSection.as index 151aab0..7d94c74 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterBottomSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterBottomSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The FooterBottomSection class is a footer bottom container section capable * of parenting other components - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterBottomSection extends ContainerBase implements IFooterSection + public class FooterBottomSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__bottom-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - */ + */ COMPILE::JS override public function addedToParent():void { @@ -97,7 +97,7 @@ package org.apache.flex.mdl else { throw new Error("FooterBottomSection can not be used if parent is not a MDL Footer component."); - } + } } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterDropDownSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterDropDownSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterDropDownSection.as index af2c2a2..1d585e5 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterDropDownSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterDropDownSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** - * The FooterDropDownSection class is a footer drop-down container (vertical) + * The FooterDropDownSection class is a footer drop-down container (vertical) * content area. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterDropDownSection extends ContainerBase implements IFooterSection + public class FooterDropDownSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__drop-down-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - + COMPILE::JS override public function addedToParent():void { @@ -97,7 +97,7 @@ package org.apache.flex.mdl else { throw new Error("FooterDropDownSection can not be used if parent is not a MDL FooterMiddleSection component."); - } - }*/ + } + }*/ } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as index 361f07d..e4dab7a 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterLeftSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The FooterLeftSection class is a footer left container section capable - * of parenting other components - * + * of parenting other components + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterLeftSection extends ContainerBase implements IFooterSection + public class FooterLeftSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__left-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer or IFooterSection. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - */ + */ COMPILE::JS override public function addedToParent():void { @@ -100,7 +100,7 @@ package org.apache.flex.mdl else { throw new Error("FooterLeftSection can not be used if parent is not a MDL Footer or IFooterSection component."); - } + } } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as index 14fa4c0..de74530 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterMiddleSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The FooterMiddleSection class is a footer middle container section capable - * of parenting other components - * + * of parenting other components + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterMiddleSection extends ContainerBase implements IFooterSection + public class FooterMiddleSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__middle-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - */ + */ COMPILE::JS override public function addedToParent():void { @@ -97,7 +97,7 @@ package org.apache.flex.mdl else { throw new Error("FooterMiddleSection can not be used if parent is not a MDL Footer component."); - } + } } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as index 9001bec..14915fd 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterRightSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The FooterRightSection class is a footer right container section capable - * of parenting other components - * + * of parenting other components + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterRightSection extends ContainerBase implements IFooterSection + public class FooterRightSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__right-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer or IFooterSection. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - */ + */ COMPILE::JS override public function addedToParent():void { @@ -100,7 +100,7 @@ package org.apache.flex.mdl else { throw new Error("FooterRightSection can not be used if parent is not a MDL Footer or IFooterSection component."); - } + } } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterTopSection.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterTopSection.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterTopSection.as index b562949..112be10 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterTopSection.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/FooterTopSection.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; import org.apache.flex.mdl.supportClasses.IFooterSection; - + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The FooterTopSection class is a footer top container section capable * of parenting other components - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class FooterTopSection extends ContainerBase implements IFooterSection + public class FooterTopSection extends Group implements IFooterSection { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-mega-footer__top-section"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -71,12 +71,12 @@ package org.apache.flex.mdl /** * Configuration depends on parent Footer. * Check to see if is mega or mini. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 - */ + */ COMPILE::JS override public function addedToParent():void { @@ -97,7 +97,7 @@ package org.apache.flex.mdl else { throw new Error("FooterTopSection can not be used if parent is not a MDL Footer component."); - } + } } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Grid.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Grid.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Grid.as index f074f81..9f2bb90 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Grid.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Grid.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Material Design Lite (MDL) grid component is a simplified method for * laying out content for multiple screen sizes. It reduces the usual coding burden @@ -32,13 +32,13 @@ package org.apache.flex.mdl * * The MDL grid is defined and enclosed by a container element. A grid has 12 columns in * the desktop screen size, 8 in the tablet size, and 4 in the phone size, each size having - * predefined margins and gutters. Cells are laid out sequentially in a row, in the order + * predefined margins and gutters. Cells are laid out sequentially in a row, in the order * they are defined, with some exceptions: - * + * * If a cell doesn't fit in the row in one of the screen sizes, it flows into the following line. * If a cell has a specified column size equal to or larger than the number of columns for the * current screen size, it takes up the entirety of its row. - * + * * You can set a maximum grid width, after which the grid stays centered with padding on either * side, by setting its max-width CSS property. * @@ -47,7 +47,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Grid extends ContainerBase + public class Grid extends Group { /** * constructor. @@ -63,7 +63,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -73,7 +73,7 @@ package org.apache.flex.mdl typeNames = "mdl-grid"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/GridCell.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/GridCell.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/GridCell.as index 9d3d562..c323896 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/GridCell.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/GridCell.as @@ -18,25 +18,25 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The GridCell class represents a cell in MDL component. * This cell is a container component capable of parenting other * components. It has several properties to allow multiple layouts * configurations - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class GridCell extends ContainerBase + public class GridCell extends Group { /** * constructor. @@ -52,7 +52,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -62,7 +62,7 @@ package org.apache.flex.mdl typeNames = "mdl-cell"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -72,7 +72,7 @@ package org.apache.flex.mdl protected var _column:Number = 4; /** * A boolean flag to activate "mdl-cell--N-col" effect selector. - * Sets the column size for the cell to N. N is 1-12 inclusive. + * Sets the column size for the cell to N. N is 1-12 inclusive. * Defaults to 4. Optional on "inner" div elements * * @langversion 3.0 @@ -89,22 +89,22 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _column + "-col"); - + if(value > 0 || value < 13) { _column = value; element.classList.add("mdl-cell--" + _column + "-col"); } - + typeNames = element.className; - } + } } protected var _columnDesktop:Number; /** * A boolean flag to activate "mdl-cell--N-col-desktop" effect selector. - * Sets the column size for the cell to N in desktop mode only. + * Sets the column size for the cell to N in desktop mode only. * N is 1-12 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -121,7 +121,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _columnDesktop + "-col-desktop"); - + if(value > 0 || value < 13) { _columnDesktop = value; @@ -130,13 +130,13 @@ package org.apache.flex.mdl } typeNames = element.className; - } + } } protected var _columnTablet:Number; /** * A boolean flag to activate "mdl-cell--N-col-tablet" effect selector. - * Sets the column size for the cell to N in tablet mode only. + * Sets the column size for the cell to N in tablet mode only. * N is 1-8 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -153,7 +153,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _columnTablet + "-col-tablet"); - + if(value > 0 || value < 9) { _columnTablet = value; @@ -168,7 +168,7 @@ package org.apache.flex.mdl protected var _columnPhone:Number; /** * A boolean flag to activate "mdl-cell--N-col-phone" effect selector. - * Sets the column size for the cell to N in phone mode only. + * Sets the column size for the cell to N in phone mode only. * N is 1-4 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -185,7 +185,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _columnPhone + "-col-phone"); - + if(value > 0 || value < 5) { _columnPhone = value; @@ -194,13 +194,13 @@ package org.apache.flex.mdl } typeNames = element.className; - } + } } protected var _offset:Number; /** * A boolean flag to activate "mdl-cell--N-offset" effect selector. - * Adds N columns of whitespace before the cell. + * Adds N columns of whitespace before the cell. * N is 1-11 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -217,7 +217,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _offset + "-offset"); - + if(value > 0 || value < 12) { _offset = value; @@ -232,7 +232,7 @@ package org.apache.flex.mdl protected var _offsetDesktop:Number; /** * A boolean flag to activate "mdl-cell--N-offset-desktop" effect selector. - * Adds N columns of whitespace before the cell in desktop mode. + * Adds N columns of whitespace before the cell in desktop mode. * N is 1-11 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -249,7 +249,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _offsetDesktop + "-offset-desktop"); - + if(value > 0 || value < 12) { _offsetDesktop = value; @@ -264,7 +264,7 @@ package org.apache.flex.mdl protected var _offsetTablet:Number; /** * A boolean flag to activate "mdl-cell--N-offset-tablet" effect selector. - * Adds N columns of whitespace before the cell in tablet mode. + * Adds N columns of whitespace before the cell in tablet mode. * N is 1-11 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -281,7 +281,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _offsetTablet + "-offset-tablet"); - + if(value > 0 || value < 12) { _offsetTablet = value; @@ -296,7 +296,7 @@ package org.apache.flex.mdl protected var _offsetPhone:Number; /** * A boolean flag to activate "mdl-cell--N-offset-phone" effect selector. - * Adds N columns of whitespace before the cell in phone mode. + * Adds N columns of whitespace before the cell in phone mode. * N is 1-11 inclusive. Optional on "inner" div elements * * @langversion 3.0 @@ -313,7 +313,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--" + _offsetPhone + "-offset-phone"); - + if(value > 0 || value < 12) { _offsetPhone = value; @@ -328,7 +328,7 @@ package org.apache.flex.mdl protected var _order:Number; /** * A boolean flag to activate "mdl-cell--order-N" effect selector. - * Reorders cell to position N. + * Reorders cell to position N. * N is 1-12 inclusive; optional on "inner" div elements * * @langversion 3.0 @@ -345,7 +345,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--order-" + _order); - + if(value > 0 || value < 13) { _order = value; @@ -360,7 +360,7 @@ package org.apache.flex.mdl protected var _orderDesktop:Number; /** * A boolean flag to activate "mdl-cell--order-N-desktop" effect selector. - * Reorders cell to position N when in desktop mode. + * Reorders cell to position N when in desktop mode. * N is 1-12 inclusive; optional on "inner" div elements * * @langversion 3.0 @@ -377,7 +377,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--order-" + _orderDesktop + "-desktop"); - + if(value > 0 || value < 13) { _orderDesktop = value; @@ -392,7 +392,7 @@ package org.apache.flex.mdl protected var _orderTablet:Number; /** * A boolean flag to activate "mdl-cell--order-N-tablet" effect selector. - * Reorders cell to position N when in tablet mode. + * Reorders cell to position N when in tablet mode. * N is 1-12 inclusive; optional on "inner" div elements * * @langversion 3.0 @@ -409,7 +409,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--order-" + _orderTablet + "-tablet"); - + if(value > 0 || value < 13) { _orderTablet = value; @@ -424,7 +424,7 @@ package org.apache.flex.mdl protected var _orderPhone:Number; /** * A boolean flag to activate "mdl-cell--order-N-phone" effect selector. - * Reorders cell to position N when in phone mode. + * Reorders cell to position N when in phone mode. * N is 1-12 inclusive; optional on "inner" div elements * * @langversion 3.0 @@ -441,7 +441,7 @@ package org.apache.flex.mdl COMPILE::JS { element.classList.remove("mdl-cell--order-" + _orderPhone + "-phone"); - + if(value > 0 || value < 13) { _orderPhone = value; @@ -452,7 +452,7 @@ package org.apache.flex.mdl typeNames = element.className; } } - + protected var _hideDesktop:Boolean = false; /** * A boolean flag to activate "mdl-cell--hide-desktop" effect selector. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Header.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Header.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Header.as index 043f105..7f6dfdc 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Header.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Header.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Header class is a Container component mainly used in NavigationLayout * and Tabs components. It used to hold a HeaderRow and/or a TabBar components @@ -35,7 +35,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class Header extends ContainerBase + public class Header extends Group { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,13 +61,13 @@ package org.apache.flex.mdl typeNames = "mdl-layout__header"; element = document.createElement('header') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; return element; } - + protected var _transparent:Boolean; /** * A boolean flag to activate "mdl-transparent--Xdp" effect selector. http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/HeaderRow.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/HeaderRow.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/HeaderRow.as index 1dd5948..b002a13 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/HeaderRow.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/HeaderRow.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The HeaderRow class is a Container component used normaly inside a Header * to layout things like a title, a navigation component,... @@ -34,7 +34,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class HeaderRow extends ContainerBase + public class HeaderRow extends Group { /** * constructor. @@ -50,7 +50,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -60,7 +60,7 @@ package org.apache.flex.mdl typeNames = "mdl-layout__header-row"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as index 7938bab..cbfcf11 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/List.as @@ -20,11 +20,13 @@ package org.apache.flex.mdl { import org.apache.flex.core.IItemRenderer; import org.apache.flex.core.IItemRendererParent; + import org.apache.flex.core.IList; import org.apache.flex.core.ILayoutHost; import org.apache.flex.core.ILayoutParent; import org.apache.flex.core.ILayoutView; import org.apache.flex.core.ISelectionModel; import org.apache.flex.core.IParentIUIBase; + import org.apache.flex.core.IFactory; import org.apache.flex.core.UIBase; import org.apache.flex.core.IChild; import org.apache.flex.events.ItemAddedEvent; @@ -48,7 +50,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - public class List extends UIBase implements IItemRendererParent, ILayoutParent, ILayoutHost, ILayoutView + public class List extends UIBase implements IItemRendererParent, ILayoutParent, ILayoutHost, ILayoutView, IList { /** * Constructor. @@ -132,6 +134,59 @@ package org.apache.flex.mdl } /** + * + */ + public function get dataGroup():IItemRendererParent + { + return this; + } + + private var _itemRenderer:IFactory; + + /** + * The class or factory used to display each item. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get itemRenderer():IFactory + { + return _itemRenderer; + } + public function set itemRenderer(value:IFactory):void + { + _itemRenderer = value; + } + + /** + * Returns whether or not the itemRenderer property has been set. + * + * @see org.apache.flex.core.IItemRendererProvider + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function get hasItemRenderer():Boolean + { + var result:Boolean = false; + + COMPILE::SWF { + result = _itemRenderer != null; + } + + COMPILE::JS { + var test:* = _itemRenderer; + result = _itemRenderer !== null && test !== undefined; + } + + return result; + } + + /** * @copy org.apache.flex.core.IItemRendererParent#addItemRenderer() * @private * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Navigation.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Navigation.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Navigation.as index 8d20000..2524bce 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Navigation.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Navigation.as @@ -18,17 +18,17 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The Navigation class is a <nav> tag in HTML. It parents a list of links - * In FlexJS Navigation is implemented as a List component and by default - * it uses NavigationLinkItemRenderer class to define each item. + * In FlexJS Navigation is implemented as a List component and by default + * it uses NavigationLinkItemRenderer class to define each item. * * @langversion 3.0 * @playerversion Flash 10.2 @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,10 +61,10 @@ package org.apache.flex.mdl typeNames = "mdl-navigation"; element = document.createElement('nav') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; - + return element; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayout.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayout.as index 255735c..a6444ed 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayout.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayout.as @@ -18,13 +18,13 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The NavigationLayout class is a Container component capable of parenting other * components. @@ -35,7 +35,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class NavigationLayout extends ContainerBase + public class NavigationLayout extends Group { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,13 +61,13 @@ package org.apache.flex.mdl typeNames = "mdl-layout mdl-js-layout"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; return element; } - + protected var _fixedHeader:Boolean; /** * A boolean flag to activate "mdl-layout--fixed-header" effect selector. @@ -90,7 +90,7 @@ package org.apache.flex.mdl { element.classList.toggle("mdl-layout--fixed-header", _fixedHeader); typeNames = element.className; - } + } } protected var _fixedDrawer:Boolean; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayoutContent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayoutContent.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayoutContent.as index 1d18258..aafcaa7 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayoutContent.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLayoutContent.as @@ -18,15 +18,15 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** - * The NavigationLayoutContent class is a Container component capable of parenting + * The NavigationLayoutContent class is a Container component capable of parenting * the content of the NavigationLayout parent. If the navigation uses a TabBar component * for navigation, each piece of content will be a TabBarPanel. * @@ -35,7 +35,7 @@ package org.apache.flex.mdl * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class NavigationLayoutContent extends ContainerBase + public class NavigationLayoutContent extends Group { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -61,7 +61,7 @@ package org.apache.flex.mdl typeNames = "mdl-layout__content"; element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as index 5ff6d1a..9cdc0c3 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/THead.as @@ -18,23 +18,23 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The THead class is a Container component capable of parenting columns * (see TableColumn class) for MDL Table - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class THead extends ContainerBase + public class THead extends Group { /** * constructor. @@ -50,7 +50,7 @@ package org.apache.flex.mdl //className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -58,7 +58,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { element = document.createElement('thead') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as index 1632c46..b325ad1 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TabBarPanel.as @@ -18,24 +18,24 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The TabBarPanel class is a Container component capable of parenting other * four components. This class is used along with Tabs to separate content and * present and organize data for the user. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class TabBarPanel extends ContainerBase + public class TabBarPanel extends Group { /** * constructor. @@ -51,7 +51,7 @@ package org.apache.flex.mdl className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -59,7 +59,7 @@ package org.apache.flex.mdl override protected function createElement():WrappedHTMLElement { element = document.createElement('section') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -68,7 +68,7 @@ package org.apache.flex.mdl /** * If TabBarPanel is used inside Tabs use a different config - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -85,15 +85,15 @@ package org.apache.flex.mdl } else { typeNames = "mdl-layout__tab-panel"; } - + element.classList.add(typeNames); } private var _isActive:Boolean; - + /** * Marks this Button as the active one in the TabBar - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -101,13 +101,13 @@ package org.apache.flex.mdl */ public function get isActive():Boolean { - return _isActive; + return _isActive; } public function set isActive(value:Boolean):void { _isActive = value; - + COMPILE::JS { element.classList.toggle("is-active", _isActive); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableCell.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableCell.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableCell.as index a699748..a58548c 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableCell.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableCell.as @@ -18,22 +18,22 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The TableCell class is a Cell for MDL Table used normaly in a TableRowItemRenderer - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class TableCell extends ContainerBase + public class TableCell extends Group { /** * constructor. @@ -47,12 +47,12 @@ package org.apache.flex.mdl { super(); } - + private var _text:String = ""; /** * The text of the td - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -73,8 +73,8 @@ package org.apache.flex.mdl textNode = document.createTextNode('') as Text; element.appendChild(textNode); } - - textNode.nodeValue = value; + + textNode.nodeValue = value; } } @@ -91,7 +91,7 @@ package org.apache.flex.mdl positioner = element; element.flexjs_wrapper = this; - + return element; } @@ -99,8 +99,8 @@ package org.apache.flex.mdl /** * Activate "mdl-data-table__cell--non-numeric" class selector, for use in table td item. * Applies text formatting to data cell. Numeric is the default - * Optional; goes on both table header and table data cells - * + * Optional; goes on both table header and table data cells + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableColumn.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableColumn.as index f0273bc..b5164fb 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableColumn.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/TableColumn.as @@ -18,25 +18,25 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl { - import org.apache.flex.core.ContainerBase; + import org.apache.flex.html.Group; COMPILE::JS { - import org.apache.flex.core.WrappedHTMLElement; + import org.apache.flex.core.WrappedHTMLElement; } - + /** * The TableColumn class represents an HTML <th> element that * be inside a <thead> in a MLD Table * Use instances of this class in columns Array property MDL Table - * + * * @toplevel * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class TableColumn extends ContainerBase + public class TableColumn extends Group { /** * constructor. @@ -55,7 +55,7 @@ package org.apache.flex.mdl /** * The text of the th - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -76,11 +76,11 @@ package org.apache.flex.mdl textNode = document.createTextNode('') as Text; element.appendChild(textNode); } - - textNode.nodeValue = value; + + textNode.nodeValue = value; } } - + COMPILE::JS protected var textNode:Text; @@ -94,7 +94,7 @@ package org.apache.flex.mdl positioner = element; element.flexjs_wrapper = this; - + return element; } @@ -102,8 +102,8 @@ package org.apache.flex.mdl /** * Activate "mdl-data-table__cell--non-numeric" class selector, for use in table td item. * Applies text formatting to data cell - * Optional; goes on both table header and table data cells - * + * Optional; goes on both table header and table data cells + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 @@ -176,4 +176,4 @@ package org.apache.flex.mdl } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d1d27547/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as index 397af4f..281d5bf 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/supportClasses/CardInner.as @@ -18,22 +18,22 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl.supportClasses { - import org.apache.flex.core.ContainerBase; - + import org.apache.flex.html.Group; + COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; } - + /** * The CardInner class is a base class por all Card inner containers. - * + * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion FlexJS 0.8 */ - public class CardInner extends ContainerBase + public class CardInner extends Group { /** * constructor. @@ -49,7 +49,7 @@ package org.apache.flex.mdl.supportClasses className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user; } - + /** * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement */ @@ -57,7 +57,7 @@ package org.apache.flex.mdl.supportClasses override protected function createElement():WrappedHTMLElement { element = document.createElement('div') as WrappedHTMLElement; - + positioner = element; element.flexjs_wrapper = this; @@ -111,6 +111,6 @@ package org.apache.flex.mdl.supportClasses { element.classList.toggle("mdl-card--expand", _expand); } - } + } } }
