You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2018/10/29 09:14:29 UTC
[royale-asjs] branch develop updated (17e77a9 -> 984d2b9)
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 17e77a9 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
new 3124fef Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
new 984d2b9 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/royale/html/beads/ButtonBarReorderBead.as | 10 +++++-----
.../apache/royale/html/beads/SingleSelectionDropTargetBead.as | 9 +++------
2 files changed, 8 insertions(+), 11 deletions(-)
[royale-asjs] 02/02: Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
Posted by yi...@apache.org.
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
commit 984d2b9a0166d965d67c95d7c9fafa29f1063647
Merge: 3124fef 17e77a9
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Mon Oct 29 11:13:54 2018 +0200
Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
[royale-asjs] 01/02: Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
Posted by yi...@apache.org.
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
commit 3124fefcc827de8bfc7ac29140d9e7e5b3911908
Merge: ee7f097 91c483b
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Mon Oct 29 10:43:07 2018 +0200
Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
.../src/main/royale/DropDownListPlayGround.mxml | 204 ++++++++++++++++++++-
.../royale/html/beads/ButtonBarReorderBead.as | 10 +-
.../html/beads/SingleSelectionDropTargetBead.as | 9 +-
.../projects/Jewel/src/main/resources/defaults.css | 4 +-
.../Jewel/src/main/resources/jewel-manifest.xml | 1 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 1 +
.../royale/org/apache/royale/jewel/DropDownList.as | 16 +-
...DownListItemRendererFactoryForCollectionView.as | 81 ++++++++
.../royale/jewel/beads/models/DropDownListModel.as | 138 ++++++++++++++
.../jewel/beads/models/IDropDownListModel.as | 32 ++++
.../royale/jewel/beads/validators/DateValidator.as | 3 -
.../royale/jewel/beads/views/DropDownListView.as | 93 ++++------
.../itemRenderers/DropDownListItemRenderer.as | 40 ++--
.../src/main/sass/components/_dropdownlist.sass | 8 +-
.../src/main/resources/spark-royale-manifest.xml | 2 +
.../src/main/royale/spark/components/TextInput.as | 12 +-
.../components/gridClasses/GridItemRenderer.as | 4 +-
.../components/gridClasses/IGridItemRenderer.as | 4 +-
.../components/supportClasses/SkinnableTextBase.as | 8 +-
.../src/main/royale/spark/primitives/Rect.as | 50 ++++-
20 files changed, 596 insertions(+), 124 deletions(-)
diff --cc frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as
index 1a18839,1a18839..5083bd2
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/ButtonBarReorderBead.as
@@@ -25,11 -25,11 +25,12 @@@ package org.apache.royale.html.bead
import org.apache.royale.core.IDragInitiator;
import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.IItemRendererParent;
++ import org.apache.royale.core.UIBase;
import org.apache.royale.core.IParent;
++ import org.apache.royale.core.ILayoutHost;
import org.apache.royale.core.IChild;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
-- import org.apache.royale.core.UIBase;
import org.apache.royale.events.DragEvent;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
@@@ -138,7 -138,7 +139,7 @@@
startHere = startHere.itemRendererParent;
}
if (startHere is IItemRenderer) {
-- var p:UIBase = startHere.itemRendererParent as UIBase;
++ var p:IParent = (startHere.itemRendererParent as ILayoutHost).contentView as IParent;
sourceIndex = p.getElementIndex(startHere as IChild);
DragEvent.dragSource = (startHere as IItemRenderer).data;
}
@@@ -243,7 -243,7 +244,7 @@@
targetIndex = -1; // assume after the end unless proven otherwise.
-- var itemRendererParent:UIBase;
++ var itemRendererParent:IParent;
var startHere:Object = event.relatedObject;
while( !(startHere is IItemRenderer) && startHere != null) {
@@@ -254,11 -254,11 +255,10 @@@
var ir:IItemRenderer = startHere as IItemRenderer;
trace("-- dropping onto an existing object: "+ir.data.toString());
-- itemRendererParent = ir.itemRendererParent as UIBase;
++ itemRendererParent = (ir.itemRendererParent as ILayoutHost).contentView as IParent;
targetIndex = itemRendererParent.getElementIndex(ir);
}
else {
-- itemRendererParent = startHere.itemRendererParent as UIBase;
trace("-- dropping after the last item");
}
diff --cc frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as
index 2ee627b,2ee627b..bd0ae73
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SingleSelectionDropTargetBead.as
@@@ -25,6 -25,6 +25,7 @@@ package org.apache.royale.html.bead
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.IParent;
++ import org.apache.royale.core.ILayoutHost;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
@@@ -298,7 -298,7 +299,7 @@@
}
var targetIndex:int = -1; // indicates drop beyond length of items
-- var itemRendererParent:UIBase;
++ var itemRendererParent:IParent;
var startHere:Object = event.relatedObject;
while( !(startHere is IItemRenderer) && startHere != null) {
@@@ -309,13 -309,13 +310,9 @@@
var ir:IItemRenderer = startHere as IItemRenderer;
//trace("-- dropping onto an existing object: "+ir.data.toString());
-- itemRendererParent = ir.itemRendererParent as UIBase;
++ itemRendererParent = (ir.itemRendererParent as ILayoutHost).contentView as IParent;
targetIndex = itemRendererParent.getElementIndex(ir);
}
-- else if (startHere != null) {
-- itemRendererParent = startHere.itemRendererParent as UIBase;
-- //trace("-- dropping after the last item");
-- }
var downPoint:Point = new Point(event.clientX, event.clientY);
//trace("Dropping at this point: "+downPoint.x+", "+downPoint.y);