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 dadfa66 jewel: remove jewel ItemRendererMouseController in favor of
basic version since is not needed anymore
dadfa66 is described below
commit dadfa6608f2cada1a2b1a525d3eb338d4769c698
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Mar 18 13:48:50 2020 +0100
jewel: remove jewel ItemRendererMouseController in favor of basic version
since is not needed anymore
---
.../projects/Jewel/src/main/resources/defaults.css | 8 +-
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 -
.../controllers/ItemRendererMouseController.as | 226 ---------------------
.../Jewel/src/main/sass/components/_list.sass | 2 +-
.../src/main/sass/components/_navigation.sass | 2 +-
.../Jewel/src/main/sass/components/_tabbar.sass | 2 +-
.../Jewel/src/main/sass/components/_table.sass | 2 +-
.../Jewel/src/main/sass/components/_wizard.sass | 22 --
8 files changed, 8 insertions(+), 257 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css
b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 566ede7..99b0d86 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3227,7 +3227,7 @@ j|List {
}
j|ListItemRenderer {
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
@media -royale-swf {
@@ -3260,7 +3260,7 @@ j|Navigation {
}
j|NavigationLinkItemRenderer {
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
.jewel.numericstepper .jewel.textinput {
@@ -3736,7 +3736,7 @@ j|TabBar {
}
j|TabBarButtonItemRenderer {
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
j|TabBarContent {
@@ -3854,7 +3854,7 @@ j|Table {
}
j|TableItemRenderer {
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController");
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController");
}
j|TBody {
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 09ea966..a5a7ba1 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -51,7 +51,6 @@ package
import
org.apache.royale.jewel.beads.controllers.DateChooserMouseController;
DateChooserMouseController;
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.ItemRendererMouseController;
ItemRendererMouseController;
import
org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController;
ListSingleSelectionMouseController;
import
org.apache.royale.jewel.beads.controllers.TableCellSelectionMouseController;
TableCellSelectionMouseController;
import org.apache.royale.jewel.beads.controllers.ComboBoxController;
ComboBoxController;
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
deleted file mode 100644
index 42e3fd8..0000000
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/ItemRendererMouseController.as
+++ /dev/null
@@ -1,226 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controllers
-{
- 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.UIBase;
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.events.BrowserEvent;
- }
- import org.apache.royale.core.ISelectableItemRenderer;
- import org.apache.royale.core.IBeadController;
- import org.apache.royale.core.IIndexedItemRenderer;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.events.ItemClickedEvent;
- import org.apache.royale.utils.getSelectionRenderBead;
-
- /**
- * The ItemRendererMouseController class can mouse events in
itemRenderers. This
- * includes roll-overs, mouse down, and mouse up. These
platform-specific events are then
- * re-dispatched as Royale events.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- * @royaleignoreimport goog.events.Event
- */
- public class ItemRendererMouseController implements IBeadController
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function ItemRendererMouseController()
- {
- }
-
- private var renderer:IIndexedItemRenderer;
- private var _strand:IStrand;
-
- /**
- * @copy org.apache.royale.core.IBead#strand
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- * @royaleignorecoercion
org.apache.royale.core.IIndexedItemRenderer
- * @royaleignorecoercion org.apache.royale.core.UIBase
- */
- public function set strand(value:IStrand):void
- {
- _strand = value;
- renderer = value as IIndexedItemRenderer;
-
- COMPILE::SWF {
- renderer.addEventListener(MouseEvent.ROLL_OVER,
rollOverHandler);
- renderer.addEventListener(MouseEvent.ROLL_OUT,
rollOutHandler);
-
renderer.addEventListener(MouseEvent.MOUSE_DOWN, mouseDownHandler);
- renderer.addEventListener(MouseEvent.MOUSE_UP,
mouseUpHandler);
- }
-
- COMPILE::JS {
- var positioner:WrappedHTMLElement = (_strand as
UIBase).positioner;
-
- goog.events.listen(positioner,
goog.events.EventType.MOUSEOVER, this.handleMouseOver);
- goog.events.listen(positioner,
goog.events.EventType.MOUSEOUT, this.handleMouseOut);
- goog.events.listen(positioner,
goog.events.EventType.MOUSEDOWN, this.handleMouseDown);
- goog.events.listen(positioner,
goog.events.EventType.CLICK, this.handleMouseUp);
- }
- }
-
- /**
- * @private
- */
- COMPILE::SWF
- protected function rollOverHandler(event:MouseEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- target.dispatchEvent(new
Event("itemRollOver",true));
- }
- }
-
- /**
- * @royaleemitcoercion
org.apache.royale.core.IIndexedItemRenderer
- */
- COMPILE::JS
- protected function handleMouseOver(event:BrowserEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target) {
- target.dispatchEvent(new
Event("itemRollOver",true));
- }
- }
-
- /**
- * @private
- */
- COMPILE::SWF
- protected function rollOutHandler(event:MouseEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- target.dispatchEvent(new
Event("itemRollOut",true));
- }
- }
-
- /**
- * @royaleemitcoercion
org.apache.royale.core.IIndexedItemRenderer
- */
- COMPILE::JS
- protected function handleMouseOut(event:BrowserEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- target.dispatchEvent(new
Event("itemRollOut",true));
- }
- }
-
- /**
- * @private
- */
- COMPILE::SWF
- protected function mouseDownHandler(event:MouseEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(target);
- selectionBead.down = true;
- target.addEventListener(MouseEvent.MOUSE_UP,
mouseUpHandler);
- }
- }
-
- /**
- * @private
- * @royaleemitcoercion
org.apache.royale.core.IIndexedItemRenderer
- */
- COMPILE::JS
- protected function handleMouseDown(event:BrowserEvent):void
- {
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(target);
- selectionBead.down = true;
- selectionBead.hovered = false;
- }
- }
-
- /**
- * @private
- */
- COMPILE::SWF
- protected function mouseUpHandler(event:MouseEvent):void
- {
- event.stopImmediatePropagation();
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- var newEvent:ItemClickedEvent = new
ItemClickedEvent("itemClicked");
- newEvent.data = target.data;
- newEvent.index = target.index;
-
- target.removeEventListener(MouseEvent.MOUSE_UP,
mouseUpHandler);
- target.dispatchEvent(newEvent);
- }
- }
-
- /**
- * @private
- * @royaleemitcoercion
org.apache.royale.core.IIndexedItemRenderer
- */
- COMPILE::JS
- protected function handleMouseUp(event:BrowserEvent):void
- {
- event.stopImmediatePropagation();
- var target:IIndexedItemRenderer = event.currentTarget
as IIndexedItemRenderer;
- if (target)
- {
- var selectionBead:ISelectableItemRenderer =
getSelectionRenderBead(target);
- if (selectionBead && selectionBead.down)
- {
- var newEvent:ItemClickedEvent = new
ItemClickedEvent("itemClicked");
- newEvent.data = target.data;
- newEvent.index = target.index;
-
- target.dispatchEvent(newEvent);
- }
- }
- }
-
- }
-}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index a6dac28..91667a8 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -51,7 +51,7 @@ j|List
//IDataProviderItemRendererMapper:
ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData")
j|ListItemRenderer
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
@media -royale-swf
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
index 7183c0b..17947ca 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
@@ -46,4 +46,4 @@ j|Navigation
min-height: 48px
j|NavigationLinkItemRenderer
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
\ No newline at end of file
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
index 02859d9..05c3479 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
@@ -110,7 +110,7 @@ $tabbarbutton-padding: 0 24px !default
opacity: 1
j|TabBarButtonItemRenderer
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
j|TabBarContent
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_table.sass
b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
index 64ab464..b9d5bc4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_table.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_table.sass
@@ -142,7 +142,7 @@ j|Table
pointer-events: none
j|TableItemRenderer
- IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
+ IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_wizard.sass
b/frameworks/projects/Jewel/src/main/sass/components/_wizard.sass
index d8b33c5..caa8c61 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_wizard.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_wizard.sass
@@ -102,25 +102,3 @@ j|WizardContent
j|WizardPage
IViewport:
ClassReference("org.apache.royale.jewel.supportClasses.NoViewport")
-// j|WizardNavigator
-// IBeadView:
ClassReference("org.apache.royale.jewel.beads.views.ListView")
-// IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController")
-// IBeadLayout:
ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
-// IItemRendererClassFactory:
ClassReference("org.apache.royale.core.ItemRendererClassFactory")
-// IItemRenderer:
ClassReference("org.apache.royale.jewel.itemRenderers.WizardButtonItemRenderer")
-// IViewport:
ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport")
-// IViewportModel:
ClassReference("org.apache.royale.html.beads.models.ViewportModel")
-// IBeadModel:
ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel")
-
-// Jewel WizardButtonItemRenderer
-// $wizardbutton-margin: 0 !default
-// $wizardbutton-padding: 0.68em 1.12em !default
-
-// WizardButtonItemRenderer variables
-// .jewel.wizardbutton
-// min-height: 48px
-// margin: $wizardbutton-margin
-// padding: $wizardbutton-padding
-
-// j|WizardButtonItemRenderer
-// IBeadController:
ClassReference("org.apache.royale.jewel.beads.controllers.ItemRendererMouseController")
