You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/01/02 07:32:31 UTC
git commit: [flex-asjs] [refs/heads/develop] - Remove parts related
to sub menus
Repository: flex-asjs
Updated Branches:
refs/heads/develop dc2aef23f -> 9888a41e5
Remove parts related to sub menus
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9888a41e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9888a41e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9888a41e
Branch: refs/heads/develop
Commit: 9888a41e584841754f8587bb467ea33d418cc2d8
Parents: dc2aef2
Author: piotrz <pi...@apache.org>
Authored: Mon Jan 2 08:32:08 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Mon Jan 2 08:32:08 2017 +0100
----------------------------------------------------------------------
.../itemRenderers/CustomMenuItemRenderer.mxml | 37 ++------------------
.../src/main/flex/models/MenuModel.as | 13 +------
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 14 +-------
.../src/main/flex/org/apache/flex/mdl/Menu.as | 23 ------------
4 files changed, 5 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
index 25b55ca..3eb4636 100644
--- a/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/itemRenderers/CustomMenuItemRenderer.mxml
@@ -18,17 +18,11 @@ limitations under the License.
-->
<mdl:MenuItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:mdl="library://ns.apache.org/flexjs/mdl" xmlns:models="models.*"
- xmlns:js="library://ns.apache.org/flexjs/basic" rollOver="onMenuItemRollOver(event)">
- <mdl:model>
- <models:MenuModel id="subMenuModel"/>
- </mdl:model>
- <mdl:beads>
+ xmlns:mdl="library://ns.apache.org/flexjs/mdl">
+ <!--<mdl:beads>
<mdl:Disabled disabled="{menuItem.disabled}"/>
- </mdl:beads>
+ </mdl:beads> -->
<fx:Script><![CDATA[
- import org.apache.flex.events.MouseEvent;
-
import vos.MenuItemVO;
[Bindable("dataChange")]
@@ -37,30 +31,5 @@ limitations under the License.
return data as MenuItemVO;
}
- override public function set data(value:Object):void
- {
- super.data = value;
-
- if (value && value.hasSubMenu)
- {
- id = "subMenu";
- }
- }
-
- private function onMenuItemRollOver(event:MouseEvent):void
- {
- if (menuItem.hasSubMenu)
- {
- subMenu.show();
- }
- }
]]></fx:Script>
- <mdl:Menu id="subMenu" dataMdlFor="subMenu" left="true" labelField="label">
- <mdl:beads>
- <js:ConstantBinding
- sourceID="subMenuModel"
- sourcePropertyName="subMenuItems"
- destinationPropertyName="dataProvider" />
- </mdl:beads>
- </mdl:Menu>
</mdl:MenuItemRenderer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
index 382a512..a68f8b9 100644
--- a/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
+++ b/examples/flexjs/MDLExample/src/main/flex/models/MenuModel.as
@@ -28,23 +28,12 @@ package models
private var _menuItems:Array = [
new MenuItemVO("Some Action"),
new MenuItemVO("Another Action"),
- new MenuItemVO("More Action", false, true)
+ new MenuItemVO("More Action", false)
];
-
- private var _subMenuItems:Array = [
- new MenuItemVO("Sub Menu Action"),
- new MenuItemVO("Sub Menu Action"),
- new MenuItemVO("Sub Menu Action")
- ]
public function get menuItems():Array
{
return _menuItems;
}
-
- public function get subMenuItems():Array
- {
- return _subMenuItems;
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
index 13f983b..414fe10 100644
--- a/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
+++ b/examples/flexjs/MDLExample/src/main/flex/vos/MenuItemVO.as
@@ -22,13 +22,11 @@ package vos
{
private var _label:String;
private var _disabled:Boolean;
- private var _hasSubMenu:Boolean;
- public function MenuItemVO(label:String, disabled:Boolean = false, hasSubMenu:Boolean = false)
+ public function MenuItemVO(label:String, disabled:Boolean = false)
{
this.label = label;
this.disabled = disabled;
- this.hasSubMenu = hasSubMenu;
}
public function get label():String
@@ -50,15 +48,5 @@ package vos
{
_disabled = value;
}
-
- public function get hasSubMenu():Boolean
- {
- return _hasSubMenu;
- }
-
- public function set hasSubMenu(value:Boolean):void
- {
- _hasSubMenu = value;
- }
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9888a41e/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
index 35ff07e..77df29a 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/Menu.as
@@ -29,7 +29,6 @@ package org.apache.flex.mdl
COMPILE::JS
{
- import org.apache.flex.events.Event;
import org.apache.flex.core.WrappedHTMLElement;
}
@@ -58,8 +57,6 @@ package org.apache.flex.mdl
className = ""; //set to empty string avoid 'undefined' output when no class selector is assigned by user;
}
- COMPILE::JS
- private var materialMenu:Object;
/**
* default position for Menu in MDL is bottom/left (or no class selector specified)
*
@@ -128,7 +125,6 @@ package org.apache.flex.mdl
typeNames = "mdl-menu mdl-js-menu";
element = document.createElement('ul') as WrappedHTMLElement;
- element.addEventListener("mdl-componentupgraded", onElementMdlComponentUpgraded, false);
positioner = element;
element.flexjs_wrapper = this;
@@ -250,24 +246,5 @@ package org.apache.flex.mdl
element.classList.toggle("mdl-js-ripple-effect", _ripple);
}
}
-
- public function show():void
- {
- COMPILE::JS
- {
- if (materialMenu)
- {
- materialMenu.show();
- }
- }
- }
-
- COMPILE::JS
- private function onElementMdlComponentUpgraded(event:Event):void
- {
- if (!event.currentTarget) return;
-
- materialMenu = event.currentTarget.MaterialMenu;
- }
}
}