[royale-asjs] branch develop updated: Preserve order of drag items when dropped

[yishayw]

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


The following commit(s) were added to refs/heads/develop by this push:
     new b4bddab  Preserve order of drag items when dropped
b4bddab is described below

commit b4bddab991a2712217c20dbf24fc6b3b1bdabd91
Author: DESKTOP-RH4S838\Yishay <yishayj...@hotmail.com>
AuthorDate: Mon Dec 2 14:21:20 2019 +0200

    Preserve order of drag items when dropped
---
 .../royale/html/beads/SensitiveMultiSelectionDropTargetBead.as     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as
 
b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as
index 58a8380..ebd558a 100644
--- 
a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as
+++ 
b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/SensitiveMultiSelectionDropTargetBead.as
@@ -17,14 +17,12 @@
 //
 
////////////////////////////////////////////////////////////////////////////////
 
-// TODO:yishayw rename this class
 package org.apache.royale.html.beads
 {
        import org.apache.royale.collections.ArrayList;
        import org.apache.royale.core.DropType;
        import org.apache.royale.core.IBead;
        import org.apache.royale.core.IMultiSelectionModel;
-       import org.apache.royale.core.IItemRenderer;
        import org.apache.royale.core.IItemRendererParent;
        import org.apache.royale.core.ISelectionModel;
        import org.apache.royale.core.IStrand;
@@ -335,11 +333,12 @@ package org.apache.royale.html.beads
                        }
 
                        var dataProviderModel:IMultiSelectionModel = 
_strand.getBeadByType(IMultiSelectionModel) as IMultiSelectionModel;
+                       var myTargetIndex:int = calculatedTargetIndex > -1 ? 
calculatedTargetIndex : 0;
                        if (dataProviderModel.dataProvider is Array) {
                                var dataArray:Array = 
dataProviderModel.dataProvider as Array;
                                for (i = 0; i < dragSource.length; i++)
                                {
-                                       
dataArray.insertAt(calculatedTargetIndex++, dragSource[i]);
+                                       dataArray.insertAt(myTargetIndex++, 
dragSource[i]);
                                }
                                var newArray:Array = dataArray.slice()
                                dataProviderModel.dataProvider = newArray;
@@ -348,7 +347,7 @@ package org.apache.royale.html.beads
                                var dataList:ArrayList = 
dataProviderModel.dataProvider as ArrayList;
                                for (i = 0; i < dragSource.length; i++)
                                {
-                                       dataList.addItemAt(dragSource[i], 
calculatedTargetIndex++);
+                                       dataList.addItemAt(dragSource[i], 
myTargetIndex++);
                                }
                        }