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 d7edd81 return ItemRendererMouseController to Basic refactoring
DataItemRenderer to IBeadController interface and setting in CSS IBeadController
d7edd81 is described below
commit d7edd811015eebc06aed0ad8b92e51af4ab9aa1a
Author: Carlos Rovira <[email protected]>
AuthorDate: Sun May 6 19:26:45 2018 +0200
return ItemRendererMouseController to Basic refactoring DataItemRenderer to
IBeadController interface and setting in CSS IBeadController
---
.../src/main/royale/DataBindingExample.as | 2 +-
.../main/royale/sample/todo/views/TodoListView.mxml | 4 ++--
.../projects/Basic/src/main/resources/defaults.css | 19 ++++++++++++-------
.../projects/Basic/src/main/royale/BasicClasses.as | 3 ++-
.../beads/controllers/ItemRendererMouseController.as | 2 +-
.../projects/Charts/src/main/resources/defaults.css | 4 ++--
.../projects/Core/src/main/royale/CoreClasses.as | 2 --
.../royale/org/apache/royale/core/DataItemRenderer.as | 12 +++++++-----
.../projects/Flat/src/main/resources/defaults.css | 4 ++--
.../projects/Jewel/src/main/resources/defaults.css | 2 +-
.../projects/Jewel/src/main/royale/JewelClasses.as | 2 +-
.../beads/controllers/ItemRendererMouseController.as | 2 +-
.../Jewel/src/main/sass/components/_itemRenderer.sass | 2 +-
.../src/main/resources/defaults.css | 2 +-
.../mdl/itemRenderers/FooterLinkItemMouseRenderer.as | 2 +-
.../itemRenderers/NavigationLinkItemMouseRenderer.as | 2 +-
.../TableRowItemSingleSelectionMouseRenderer.as | 2 +-
17 files changed, 37 insertions(+), 31 deletions(-)
diff --git
a/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
b/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
index 11c7cc9..9b26c88 100644
---
a/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
+++
b/examples/royale/DataBindingExample_as/src/main/royale/DataBindingExample.as
@@ -28,7 +28,7 @@ import org.apache.royale.core.beads.GroupView;
import org.apache.royale.html.beads.DataItemRendererFactoryForArrayData;
import org.apache.royale.html.beads.ListView;
import org.apache.royale.html.beads.TextItemRendererFactoryForArrayData;
-import org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+import org.apache.royale.html.beads.controllers.ItemRendererMouseController;
import
org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController;
import org.apache.royale.html.beads.layouts.BasicLayout;
import org.apache.royale.html.beads.layouts.VerticalLayout;
diff --git
a/examples/royale/TodoListSampleApp/src/main/royale/sample/todo/views/TodoListView.mxml
b/examples/royale/TodoListSampleApp/src/main/royale/sample/todo/views/TodoListView.mxml
index cd4731c..701b330 100644
---
a/examples/royale/TodoListSampleApp/src/main/royale/sample/todo/views/TodoListView.mxml
+++
b/examples/royale/TodoListSampleApp/src/main/royale/sample/todo/views/TodoListView.mxml
@@ -31,7 +31,7 @@ limitations under the License.
backgroundColor: #FFFF;
height: 40px;
padding: 4px;
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
.RendererText {
@@ -55,7 +55,7 @@ limitations under the License.
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.ItemRendererEvent;
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+ import
org.apache.royale.html.beads.controllers.ItemRendererMouseController;
import sample.todo.events.TodoListEvent;
import sample.todo.models.TodoListModel;
diff --git a/frameworks/projects/Basic/src/main/resources/defaults.css
b/frameworks/projects/Basic/src/main/resources/defaults.css
index cd2af12..9050312 100644
--- a/frameworks/projects/Basic/src/main/resources/defaults.css
+++ b/frameworks/projects/Basic/src/main/resources/defaults.css
@@ -245,9 +245,14 @@ DateChooserHeader {
height: 20px;
}
+DataItemRenderer
+{
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
+}
+
DateItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
text-align: center;
flex-shrink: 0;
flex-grow: 1;
@@ -634,7 +639,7 @@ Spinner
StringItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
padding-top: 4px;
padding-bottom: 4px;
flex-shrink: 0;
@@ -652,7 +657,7 @@ AccordionItemRenderer
TreeItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 24;
flex-shrink: 0;
flex-grow: 1;
@@ -660,7 +665,7 @@ TreeItemRenderer
MenuItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 24;
flex-shrink: 0;
flex-grow: 1;
@@ -668,7 +673,7 @@ MenuItemRenderer
MenuBarItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 24;
flex-shrink: 0;
flex-grow: 1;
@@ -676,7 +681,7 @@ MenuBarItemRenderer
CascadingMenuItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 24;
flex-shrink: 0;
flex-grow: 1;
@@ -1099,7 +1104,7 @@ global
/*
TextFieldItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 16;
}
*/
diff --git a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
index 891cff3..69ba31d 100644
--- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
@@ -50,7 +50,8 @@ internal class BasicClasses
import org.apache.royale.html.supportClasses.VDividedContainerGripper;
VDividedContainerGripper;
import
org.apache.royale.html.beads.controllers.HDividedContainerMouseController;
HDividedContainerMouseController;
import
org.apache.royale.html.beads.controllers.VDividedContainerMouseController;
VDividedContainerMouseController;
-
+ import
org.apache.royale.html.beads.controllers.ItemRendererMouseController;
ItemRendererMouseController;
+
import org.apache.royale.html.MenuBar; MenuBar;
import org.apache.royale.html.beads.models.MenuBarModel; MenuBarModel;
import org.apache.royale.html.supportClasses.MenuBarItemRenderer;
MenuBarItemRenderer;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ItemRendererMouseController.as
similarity index 99%
copy from
frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
copy to
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ItemRendererMouseController.as
index d019a9d..c9c53e5 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ItemRendererMouseController.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.controllers
+package org.apache.royale.html.beads.controllers
{
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.ISelectableItemRenderer;
diff --git a/frameworks/projects/Charts/src/main/resources/defaults.css
b/frameworks/projects/Charts/src/main/resources/defaults.css
index 005d359..1141bb9 100644
--- a/frameworks/projects/Charts/src/main/resources/defaults.css
+++ b/frameworks/projects/Charts/src/main/resources/defaults.css
@@ -35,12 +35,12 @@ BarChart
BoxItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
WedgeItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
ColumnChart
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index d7044ea..9e1843a 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -43,8 +43,6 @@ internal class CoreClasses
import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
import org.apache.royale.core.beads.IDropDownListView;
IDropDownListView;
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
ItemRendererMouseController;
-
import org.apache.royale.events.ItemAddedEvent; ItemAddedEvent;
import org.apache.royale.events.ItemClickedEvent; ItemClickedEvent;
import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
index dc47ba9..a69d366 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataItemRenderer.as
@@ -26,7 +26,7 @@ package org.apache.royale.core
{
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+ import org.apache.royale.core.IBeadController;
}
import org.apache.royale.core.ValuesManager;
@@ -112,9 +112,11 @@ package org.apache.royale.core
_dataField = value;
}
+ /**
+ * This should be an implementation like
ItemRendererMouseController
+ */
COMPILE::JS
- protected var controller:ItemRendererMouseController;
-
+ protected var controller:IBeadController;
/**
* @private
@@ -150,8 +152,8 @@ package org.apache.royale.core
{
addElementToWrapper(this,'div');
className = 'DataItemRenderer';
- controller = new ItemRendererMouseController();
- controller.strand = this;
+ //controller = new ItemRendererMouseController();
+ //controller.strand = this;
return element;
}
diff --git a/frameworks/projects/Flat/src/main/resources/defaults.css
b/frameworks/projects/Flat/src/main/resources/defaults.css
index dacfe6e..faf6179 100644
--- a/frameworks/projects/Flat/src/main/resources/defaults.css
+++ b/frameworks/projects/Flat/src/main/resources/defaults.css
@@ -464,7 +464,7 @@ SimpleList
StringItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 16;
}
@@ -833,7 +833,7 @@ TextButton
TextFieldItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
height: 16;
}
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 45a0e8e..24a14c7 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -136,7 +136,7 @@ j|ControlBar {
}
}
j|ListItemRenderer {
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
}
.jewel.label {
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index bf90bf2..385f1cc 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -68,7 +68,7 @@ package
import
org.apache.royale.jewel.beads.layouts.HorizontalLayoutSpaceBetween;
HorizontalLayoutSpaceBetween;
//import org.apache.royale.jewel.beads.views.JewelLabelViewBead;
JewelLabelViewBead;
-
+ import
org.apache.royale.jewel.beads.controllers.ItemRendererMouseController;
ItemRendererMouseController;
}
}
\ No newline at end of file
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
similarity index 99%
rename from
frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
rename to
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
index d019a9d..a114dba 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/beads/controllers/ItemRendererMouseController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core.beads.controllers
+package org.apache.royale.jewel.beads.controllers
{
import org.apache.royale.core.IBeadController;
import org.apache.royale.core.ISelectableItemRenderer;
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
index c321aef..2f113dd 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_itemRenderer.sass
@@ -23,4 +23,4 @@
j|ListItemRenderer
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
+ IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
index 0363eaa..33be588 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
+++ b/frameworks/projects/MaterialDesignLite/src/main/resources/defaults.css
@@ -104,7 +104,7 @@ Navigation
MenuItemRenderer
{
- IBeadController:
ClassReference("org.apache.royale.core.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
Menu
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemMouseRenderer.as
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemMouseRenderer.as
index 50f331d..1e7e3db 100644
---
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemMouseRenderer.as
+++
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/FooterLinkItemMouseRenderer.as
@@ -20,7 +20,7 @@ package org.apache.royale.mdl.itemRenderers
{
COMPILE::JS
{
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+ import
org.apache.royale.html.beads.controllers.ItemRendererMouseController;
import org.apache.royale.core.WrappedHTMLElement;
}
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemMouseRenderer.as
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemMouseRenderer.as
index fb98e49..6f12f5c 100644
---
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemMouseRenderer.as
+++
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/NavigationLinkItemMouseRenderer.as
@@ -20,7 +20,7 @@ package org.apache.royale.mdl.itemRenderers
{
COMPILE::JS
{
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+ import
org.apache.royale.html.beads.controllers.ItemRendererMouseController;
import org.apache.royale.core.WrappedHTMLElement;
}
diff --git
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemSingleSelectionMouseRenderer.as
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemSingleSelectionMouseRenderer.as
index 75263b4..ac16b81 100644
---
a/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemSingleSelectionMouseRenderer.as
+++
b/frameworks/projects/MaterialDesignLite/src/main/royale/org/apache/royale/mdl/itemRenderers/TableRowItemSingleSelectionMouseRenderer.as
@@ -20,7 +20,7 @@ package org.apache.royale.mdl.itemRenderers
{
COMPILE::JS
{
- import
org.apache.royale.core.beads.controllers.ItemRendererMouseController;
+ import
org.apache.royale.html.beads.controllers.ItemRendererMouseController;
import org.apache.royale.core.WrappedHTMLElement;
}
--
To stop receiving notification emails like this one, please contact
[email protected].
