- Extend SnackbarModel by ToastModel - Fix UI in example
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d0a69eb8 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d0a69eb8 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d0a69eb8 Branch: refs/heads/feature/fontawesome Commit: d0a69eb896345628c34cc2bf22252a3f99084c0f Parents: 79db074 Author: piotrz <[email protected]> Authored: Wed Dec 28 15:30:13 2016 +0100 Committer: piotrz <[email protected]> Committed: Wed Dec 28 15:30:13 2016 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/Snackbar.mxml | 8 ++-- .../main/flex/org/apache/flex/mdl/Snackbar.as | 22 +---------- .../flex/mdl/beads/models/SnackbarModel.as | 39 ++------------------ 3 files changed, 9 insertions(+), 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml index fb46676..753fae5 100644 --- a/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/Snackbar.mxml @@ -20,14 +20,14 @@ limitations under the License. <mdl:TabBarPanel xmlns:fx="http://ns.adobe.com/mxml/2009"; xmlns:mdl="library://ns.apache.org/flexjs/mdl"> <mdl:Grid> - <mdl:GridCell column="1"> + <mdl:GridCell column="1" width="200"> <mdl:Button id="showToast" click="onShowToastClick(event)" - text="Show Toast!" width="200" accent="true" colored="true" raised="true"/> + text="Show Toast!" width="180" accent="true" colored="true" raised="true"/> <mdl:Toast id="toast" message="Toast message" timeout="3000"/> </mdl:GridCell> - <mdl:GridCell column="1"> + <mdl:GridCell column="2" width="200"> <mdl:Button id="showSnackbar" click="onShowSnackbarClick(event)" - text="Show !" width="200" accent="true" colored="true" raised="true"/> + text="Show Snackbar!" width="180" accent="true" colored="true" raised="true"/> <mdl:Snackbar id="snackbar" message="Snackbar message" actionText="Undo" timeout="3000" action="onSnackBarAction(event)"/> </mdl:GridCell> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as index f4b2944..7d8fb92 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Snackbar.as @@ -61,27 +61,7 @@ package org.apache.flex.mdl { super(); } - - override public function get message():String - { - return ISnackbarModel(model).message; - } - - override public function set message(value:String):void - { - ISnackbarModel(model).message = value; - } - - override public function get timeout():int - { - return ISnackbarModel(model).timeout; - } - - override public function set timeout(value:int):void - { - ISnackbarModel(model).timeout = value; - } - + public function get actionText():String { return ISnackbarModel(model).actionText; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d0a69eb8/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as index be182fd..d86f081 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/beads/models/SnackbarModel.as @@ -18,42 +18,16 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.mdl.beads.models { - import org.apache.flex.core.IStrand; - import org.apache.flex.events.EventDispatcher; import org.apache.flex.events.Event; - public class SnackbarModel extends EventDispatcher implements ISnackbarModel + public class SnackbarModel extends ToastModel implements ISnackbarModel { - private var _message:String = ""; - private var _timeout:int = 2750; private var _actionText:String = ""; - private var _strand:IStrand; - public function SnackbarModel() { super(); } - - public function get message():String - { - return _message; - } - - public function set message(value:String):void - { - _message = value; - } - - public function get timeout():int - { - return _timeout; - } - - public function set timeout(value:int):void - { - _timeout = value; - } public function get actionText():String { @@ -65,21 +39,16 @@ package org.apache.flex.mdl.beads.models _actionText = value; } - public function get snackbarData():Object + override public function get snackbarData():Object { return { - message: _message, - timeout: _timeout, + message: message, + timeout: timeout, actionHandler: onActionHandler, actionText: _actionText }; } - public function set strand(value:IStrand):void - { - _strand = value; - } - private function onActionHandler(event:Event):void { dispatchEvent(new Event("action"));
