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 91cbd1f move "selectable" and "hoverable" from UIItemRendererBase to
StyledMXMLItemRenderer for PAYG reasons
91cbd1f is described below
commit 91cbd1f1ff7804dcf90700d8e2b4e17f5a1d4249
Author: Carlos Rovira <[email protected]>
AuthorDate: Fri Feb 15 19:57:47 2019 +0100
move "selectable" and "hoverable" from UIItemRendererBase to
StyledMXMLItemRenderer for PAYG reasons
---
.../apache/royale/core/StyledMXMLItemRenderer.as | 54 +++++++++++++++++-
.../html/supportClasses/UIItemRendererBase.as | 46 ---------------
.../projects/Core/src/main/royale/CoreClasses.as | 1 +
...nderer.as => IRuntimeSelectableItemRenderer.as} | 65 +---------------------
.../apache/royale/core/ISelectableItemRenderer.as | 30 ----------
.../controllers/ItemRendererMouseController.as | 17 +++---
6 files changed, 65 insertions(+), 148 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index baa300d..fa86c50 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -18,9 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ import org.apache.royale.html.supportClasses.MXMLItemRenderer;
import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
- import org.apache.royale.html.supportClasses.MXMLItemRenderer;
/**
* The StyledMXMLItemRenderer class is the base class for
itemRenderers that are MXML-based
@@ -31,7 +31,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class StyledMXMLItemRenderer extends MXMLItemRenderer implements
IClassSelectorListSupport
+ public class StyledMXMLItemRenderer extends MXMLItemRenderer implements
IClassSelectorListSupport, IRuntimeSelectableItemRenderer
{
/**
* constructor.
@@ -136,5 +136,55 @@ package org.apache.royale.core
return false;
}
}
+
+ /************************************
+ * IRuntimeSelectableItemRenderer
+ ************************************/
+
+ private var _selectable:Boolean = true;
+ /**
+ * <code>true</code> if the item renderer is can be selected
+ * false otherwise. Use to configure a renderer to be non
+ * selectable.
+ *
+ * Defaults to true
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.3
+ */
+ public function get selectable():Boolean
+ {
+ return _selectable;
+ }
+
+ public function set selectable(value:Boolean):void
+ {
+ _selectable = value;
+ }
+
+ private var _hoverable:Boolean = true;
+ /**
+ * <code>true</code> if the item renderer is can be hovered
+ * false otherwise. Use to configure a renderer to be non
+ * hoverable.
+ *
+ * Defaults to true
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.9.3
+ */
+ public function get hoverable():Boolean
+ {
+ return _hoverable;
+ }
+
+ public function set hoverable(value:Boolean):void
+ {
+ _hoverable = value;
+ }
}
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
index acc779c..291596a 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
@@ -261,29 +261,6 @@ package org.apache.royale.html.supportClasses
updateRenderer();
}
- private var _selectable:Boolean = true;
- /**
- * <code>true</code> if the item renderer is can be selected
- * false otherwise. Use to configure a renderer to be non
- * selectable.
- *
- * Defaults to true
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- public function get selectable():Boolean
- {
- return _selectable;
- }
-
- public function set selectable(value:Boolean):void
- {
- _selectable = value;
- }
-
private var _selected:Boolean;
/**
@@ -304,29 +281,6 @@ package org.apache.royale.html.supportClasses
updateRenderer();
}
- private var _hoverable:Boolean = true;
- /**
- * <code>true</code> if the item renderer is can be hovered
- * false otherwise. Use to configure a renderer to be non
- * hoverable.
- *
- * Defaults to true
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- public function get hoverable():Boolean
- {
- return _hoverable;
- }
-
- public function set hoverable(value:Boolean):void
- {
- _hoverable = value;
- }
-
private var _down:Boolean;
/**
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index a06c1fc..3809370 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -129,6 +129,7 @@ import org.apache.royale.events.ItemRemovedEvent;
ItemRemovedEvent;
{
import org.apache.royale.core.IScrollBarModel; IScrollBarModel;
}
+ import org.apache.royale.core.IRuntimeSelectableItemRenderer;
IRuntimeSelectableItemRenderer;
import org.apache.royale.core.ISelectableItemRenderer;
ISelectableItemRenderer;
import org.apache.royale.core.ISelectable; ISelectable;
import org.apache.royale.core.ISelectionModel; ISelectionModel;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRuntimeSelectableItemRenderer.as
similarity index 54%
copy from
frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
copy to
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRuntimeSelectableItemRenderer.as
index 321d75b..d5df28b 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IRuntimeSelectableItemRenderer.as
@@ -29,33 +29,9 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public interface ISelectableItemRenderer extends IItemRenderer
+ public interface IRuntimeSelectableItemRenderer extends
ISelectableItemRenderer
{
-
- /**
- * The property on the data item that the item renderer
- * should renderer.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get labelField():String;
- function set labelField(value:String):void;
-
- /**
- * The index of the data item in the data provider.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get index():int;
- function set index(value:int):void;
-
- /**
+ /**
* <code>true</code> if the item renderer is can be selected
* false otherwise. Use to configure a renderer to be non
* selectable.
@@ -71,18 +47,6 @@ package org.apache.royale.core
function set selectable(value:Boolean):void;
/**
- * <code>true</code> if the item renderer is rendering
- * an item that is selected.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get selected():Boolean;
- function set selected(value:Boolean):void;
-
- /**
* <code>true</code> if the item renderer is can be hovered
* false otherwise. Use to configure a renderer to be non
* hoverable.
@@ -96,30 +60,5 @@ package org.apache.royale.core
*/
function get hoverable():Boolean;
function set hoverable(value:Boolean):void;
-
- /**
- * <code>true</code> if the item renderer is rendering
- * an item that is under the mouse pointer.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get hovered():Boolean;
- function set hovered(value:Boolean):void;
-
- /**
- * <code>true</code> if the item renderer is rendering
- * an item that is under the mouse pointer and the
- * mouse button is down.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get down():Boolean;
- function set down(value:Boolean):void;
}
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
index 321d75b..db4e67a 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ISelectableItemRenderer.as
@@ -56,21 +56,6 @@ package org.apache.royale.core
function set index(value:int):void;
/**
- * <code>true</code> if the item renderer is can be selected
- * false otherwise. Use to configure a renderer to be non
- * selectable.
- *
- * Defaults to true
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- function get selectable():Boolean;
- function set selectable(value:Boolean):void;
-
- /**
* <code>true</code> if the item renderer is rendering
* an item that is selected.
*
@@ -81,21 +66,6 @@ package org.apache.royale.core
*/
function get selected():Boolean;
function set selected(value:Boolean):void;
-
- /**
- * <code>true</code> if the item renderer is can be hovered
- * false otherwise. Use to configure a renderer to be non
- * hoverable.
- *
- * Defaults to true
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.3
- */
- function get hoverable():Boolean;
- function set hoverable(value:Boolean):void;
/**
* <code>true</code> if the item renderer is rendering
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
index 63920c5..e3447ba 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
@@ -18,21 +18,24 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.beads.controllers
{
- import org.apache.royale.core.IBeadController;
- import org.apache.royale.core.ISelectableItemRenderer;
- import org.apache.royale.core.IStrand;
COMPILE::SWF {
import org.apache.royale.events.Event;
import org.apache.royale.events.MouseEvent;
}
COMPILE::JS {
+ import goog.events;
+ import goog.events.Event;
+ import goog.events.EventType;
+
+ import org.apache.royale.core.IRuntimeSelectableItemRenderer;
import org.apache.royale.core.UIBase;
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.events.BrowserEvent;
- import goog.events.Event;
- import goog.events.EventType;
- import goog.events;
+
}
+ import org.apache.royale.core.IBeadController;
+ import org.apache.royale.core.ISelectableItemRenderer;
+ import org.apache.royale.core.IStrand;
import org.apache.royale.events.ItemClickedEvent;
/**
@@ -203,7 +206,7 @@ COMPILE::JS {
protected function handleMouseUp(event:BrowserEvent):void
{
event.stopImmediatePropagation();
- var target:ISelectableItemRenderer =
event.currentTarget as ISelectableItemRenderer;
+ var target:IRuntimeSelectableItemRenderer =
event.currentTarget as IRuntimeSelectableItemRenderer;
if (target && target.selectable)
{
var newEvent:ItemClickedEvent = new
ItemClickedEvent("itemClicked");
