This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7ab086811e Remove dependency on CascadingMenu in favor of IMenu
7ab086811e is described below
commit 7ab086811e0779121ef2a631ef58e9fe8a7d6ab0
Author: Yishay Weiss <[email protected]>
AuthorDate: Wed Apr 13 00:34:00 2022 +0300
Remove dependency on CascadingMenu in favor of IMenu
---
.../controllers/CascadingMenuSelectionMouseController.as | 13 ++++++-------
.../controllers/CascadingMenuSelectionMouseController.as | 4 ++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
index b602c16908..7327fe4bea 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/CascadingMenuSelectionMouseController.as
@@ -25,7 +25,6 @@ package org.apache.royale.html.beads.controllers
import org.apache.royale.core.ICascadingMenuModel;
import org.apache.royale.events.Event;
import org.apache.royale.events.ItemClickedEvent;
- import org.apache.royale.html.CascadingMenu;
import org.apache.royale.html.Menu;
import org.apache.royale.html.beads.models.MenuModel;
import org.apache.royale.core.ISelectionModel;
@@ -96,10 +95,10 @@ package org.apache.royale.html.beads.controllers
var dp:Object =
getSubMenuDataProvider(model.selectedItem, model);
if (dp)
{
- var nextMenu:CascadingMenu =
getMenuWithDataProvider(MenuModel.menuList, dp);
+ var nextMenu:IMenu =
getMenuWithDataProvider(MenuModel.menuList, dp);
if (nextMenu)
{
-
clearSubmenusOnSameLevel(nextMenu, nextMenu.model as ISelectionModel);
+
clearSubmenusOnSameLevel(nextMenu as UIBase, (nextMenu as UIBase).model as
ISelectionModel);
}
}
}
@@ -141,10 +140,10 @@ package org.apache.royale.html.beads.controllers
{
// though this is being called
in a loop, performance shouldn't be a big issue as
// number of open nested menus
is expected to be small
- var nextMenu:CascadingMenu =
getMenuWithDataProvider(menuList, dp);
+ var nextMenu:IMenu =
getMenuWithDataProvider(menuList, dp);
if (nextMenu)
{
-
clearSubmenusOnSameLevel(nextMenu, nextMenu.model as ISelectionModel);
+
clearSubmenusOnSameLevel(nextMenu as UIBase, (nextMenu as UIBase).model as
ISelectionModel);
break;
}
}
@@ -163,12 +162,12 @@ package org.apache.royale.html.beads.controllers
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- protected function getMenuWithDataProvider(menuList:Array,
dp:Object):CascadingMenu
+ protected function getMenuWithDataProvider(menuList:Array,
dp:Object):IMenu
{
// go over open menus and return the one with the given
data provider
for (var i:int = 0; i < menuList.length; i++)
{
- var cascadingMenu:CascadingMenu = menuList[i]
as CascadingMenu;
+ var cascadingMenu:IMenu = menuList[i] as IMenu;
if (cascadingMenu && cascadingMenu.dataProvider
== dp)
{
return cascadingMenu;
diff --git
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/controllers/CascadingMenuSelectionMouseController.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/controllers/CascadingMenuSelectionMouseController.as
index 06397c8c68..7e0d8db6ba 100644
---
a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/controllers/CascadingMenuSelectionMouseController.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/controllers/CascadingMenuSelectionMouseController.as
@@ -113,7 +113,7 @@ package mx.controls.beads.controllers
* @playerversion AIR 2.6
* @productversion Royale 0.9.6
*/
- override protected function
getMenuWithDataProvider(menuList:Array, dp:Object):CascadingMenu
+ override protected function
getMenuWithDataProvider(menuList:Array, dp:Object):IMenu
{
if (!(dp is XMLListCollection))
{
@@ -123,7 +123,7 @@ package mx.controls.beads.controllers
// go over open menus and return the one with the given
data provider
for (var i:int = 0; i < menuList.length; i++)
{
- var cascadingMenu:CascadingMenu = menuList[i]
as CascadingMenu;
+ var cascadingMenu:IMenu = menuList[i] as IMenu;
if (cascadingMenu &&
(cascadingMenu.dataProvider as XMLListCollection).toXMLString() ==
xmlListCollection.toXMLString())
{
return cascadingMenu;
