This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 e563a4a jewel-ListKeyDownController: convert to IBeadKeyController
e563a4a is described below
commit e563a4a8ae5cdb0761802f9030bfd7574beb6920
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Apr 24 18:54:48 2020 +0200
jewel-ListKeyDownController: convert to IBeadKeyController
---
frameworks/projects/Jewel/src/main/resources/defaults.css | 1 +
frameworks/projects/Jewel/src/main/royale/JewelClasses.as | 1 +
.../Jewel/src/main/royale/org/apache/royale/jewel/List.as | 15 +++++++++++++--
.../jewel/beads/controllers/ListKeyDownController.as | 4 ++--
.../org/apache/royale/jewel/beads/views/ListView.as | 3 ---
.../projects/Jewel/src/main/sass/components/_list.sass | 1 +
6 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index eeed4a3..91972dc 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3244,6 +3244,7 @@ j|Label {
j|List {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ListView");
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController");
+ IBeadKeyController:
ClassReference("org.apache.royale.jewel.beads.controllers.ListKeyDownController");
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout");
IItemRendererClassFactory:
ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory");
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer");
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index c337bff..29c6ef5 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -52,6 +52,7 @@ package
import
org.apache.royale.jewel.beads.controllers.DateFieldMouseController;
DateFieldMouseController;
import org.apache.royale.jewel.beads.controllers.AlertController;
AlertController;
import
org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController;
ListSingleSelectionMouseController;
+ import
org.apache.royale.jewel.beads.controllers.ListKeyDownController;
ListKeyDownController;
import
org.apache.royale.jewel.beads.controllers.TableCellSelectionMouseController;
TableCellSelectionMouseController;
import org.apache.royale.jewel.beads.controllers.ComboBoxController;
ComboBoxController;
import
org.apache.royale.jewel.beads.controllers.SnackbarController;
SnackbarController;
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 08dadeb..f6a0cc0 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
@@ -19,16 +19,17 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadKeyController;
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrandWithPresentationModel;
import org.apache.royale.jewel.beads.layouts.IVariableRowHeight;
import org.apache.royale.jewel.beads.models.ListPresentationModel;
+ import org.apache.royale.jewel.beads.views.IScrollToIndexView;
import
org.apache.royale.jewel.supportClasses.container.DataContainerBase;
import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
- import org.apache.royale.jewel.beads.views.IScrollToIndexView;
- import org.apache.royale.events.Event;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
/**
* Indicates that the initialization of the list is complete.
@@ -279,5 +280,15 @@ package org.apache.royale.jewel
{
return (view as
IScrollToIndexView).scrollToIndex(index);
}
+
+ /**
+ * @private
+ */
+ override public function addedToParent():void
+ {
+ super.addedToParent();
+
+ loadBeadFromValuesManager(IBeadKeyController,
"iBeadKeyController", this);
+ }
}
}
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
index 2ac03ff..966cc8d 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ListKeyDownController.as
@@ -19,7 +19,7 @@
package org.apache.royale.jewel.beads.controllers
{
import org.apache.royale.core.Bead;
- import org.apache.royale.core.IBeadController;
+ import org.apache.royale.core.IBeadKeyController;
import org.apache.royale.core.IFocusable;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
@@ -46,7 +46,7 @@ package org.apache.royale.jewel.beads.controllers
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public class ListKeyDownController extends Bead implements
IBeadController
+ public class ListKeyDownController extends Bead implements
IBeadKeyController
{
/**
* Constructor.
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
index 88c1678..dc8dba5 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/ListView.as
@@ -34,7 +34,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.events.Event;
import org.apache.royale.html.beads.DataContainerView;
- import org.apache.royale.jewel.beads.controllers.ListKeyDownController;
import org.apache.royale.jewel.beads.models.ListPresentationModel;
import
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
import org.apache.royale.utils.getSelectionRenderBead;
@@ -92,8 +91,6 @@ package org.apache.royale.jewel.beads.views
listModel.addEventListener("rollOverIndexChanged",
rollOverIndexChangeHandler);
super.handleInitComplete(event);
-
- _strand.addBead(new ListKeyDownController());
}
/**
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index 91667a8..7a9dac8 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -38,6 +38,7 @@
j|List
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.ListView")
IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController")
+ IBeadKeyController:
ClassReference("org.apache.royale.jewel.beads.controllers.ListKeyDownController")
IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.VerticalLayout")
IItemRendererClassFactory:
ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory")
IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer")
