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 2019/11/18 10:53:34 UTC

[royale-asjs] branch multi_select updated: Make sure changes in selection array are not ignored

This is an automated email from the ASF dual-hosted git repository.

yishayw pushed a commit to branch multi_select
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/multi_select by this push:
     new 73288c8  Make sure changes in selection array are not ignored
73288c8 is described below

commit 73288c84e0a2401a290d533fd53a14df1c8d28d5
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Mon Nov 18 12:52:49 2019 +0200

    Make sure changes in selection array are not ignored
---
 .../ListMultiSelectionMouseController.as           | 193 +++++++++++----------
 1 file changed, 97 insertions(+), 96 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListMultiSelectionMouseController.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListMultiSelectionMouseController.as
index ff90ded..7f8241c 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListMultiSelectionMouseController.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/controllers/ListMultiSelectionMouseController.as
@@ -30,80 +30,80 @@ package org.apache.royale.html.beads.controllers
 	import org.apache.royale.events.ItemRemovedEvent;
 	import org.apache.royale.events.MouseEvent;
 	import org.apache.royale.html.beads.IListView;
-	
+
 	import org.apache.royale.events.ItemClickedEvent;
 
-    /**
-     *  The ListMultiSelectionMouseController class is a controller for
-     *  org.apache.royale.html.List.  Controllers
-     *  watch for events from the interactive portions of a View and
-     *  update the data model or dispatch a semantic event.
-     *  This controller watches for events from the item renderers
-     *  and updates an IMultiSelectionModel (which supports multi
-     *  selection).      
-     * 
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion Royale 0.9.7
-     */
+	/**
+	 *  The ListMultiSelectionMouseController class is a controller for
+	 *  org.apache.royale.html.List.  Controllers
+	 *  watch for events from the interactive portions of a View and
+	 *  update the data model or dispatch a semantic event.
+	 *  This controller watches for events from the item renderers
+	 *  and updates an IMultiSelectionModel (which supports multi
+	 *  selection).      
+	 * 
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion Royale 0.9.7
+	 */
 	public class ListMultiSelectionMouseController implements IBeadController
 	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
+		/**
+		 *  Constructor.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.7
+		 */
 		public function ListMultiSelectionMouseController()
 		{
 		}
-		
-        /**
-         *  The model.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
+
+		/**
+		 *  The model.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.7
+		 */
 		protected var listModel:IMultiSelectionModel;
 
-        /**
-         *  The view.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        protected var listView:IListView;
+		/**
+		 *  The view.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.7
+		 */
+		protected var listView:IListView;
 
-        /**
-         *  The parent of the item renderers.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        protected var dataGroup:IItemRendererParent;
+		/**
+		 *  The parent of the item renderers.
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.7
+		 */
+		protected var dataGroup:IItemRendererParent;
 
 		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.7
-         *  @royaleignorecoercion org.apache.royale.core.IMultiSelectionModel
-         *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         *  @royaleignorecoercion org.apache.royale.html.beads.IListView
-         */
+
+		/**
+		 *  @copy org.apache.royale.core.IBead#strand
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion Royale 0.9.7
+		 *  @royaleignorecoercion org.apache.royale.core.IMultiSelectionModel
+		 *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+		 *  @royaleignorecoercion org.apache.royale.html.beads.IListView
+		 */
 		public function set strand(value:IStrand):void
 		{
 			_strand = value;
@@ -112,52 +112,53 @@ package org.apache.royale.html.beads.controllers
 			IEventDispatcher(_strand).addEventListener("itemAdded", handleItemAdded);
 			IEventDispatcher(_strand).addEventListener("itemRemoved", handleItemRemoved);
 		}
-		
-        /**
-         * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         */
+
+		/**
+		 * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+		 */
 		protected function handleItemAdded(event:ItemAddedEvent):void
 		{
 			IEventDispatcher(event.item).addEventListener("itemClicked", selectedHandler);
 			IEventDispatcher(event.item).addEventListener("itemRollOver", rolloverHandler);
 			IEventDispatcher(event.item).addEventListener("itemRollOut", rolloutHandler);
 		}
-		
-        /**
-         * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         */
+
+		/**
+		 * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+		 */
 		protected function handleItemRemoved(event:ItemRemovedEvent):void
 		{
 			IEventDispatcher(event.item).removeEventListener("itemClicked", selectedHandler);
 			IEventDispatcher(event.item).removeEventListener("itemRollOver", rolloverHandler);
 			IEventDispatcher(event.item).removeEventListener("itemRollOut", rolloutHandler);
 		}
-		
+
 		protected function selectedHandler(event:ItemClickedEvent):void
-        {
-            var selectedIndices:Array = [];
-            if (!event.multipleSelection || !listModel.selectedIndices)
-            {
-                listModel.selectedIndices = [event.index];
-            } else
-            {
-               var indices:Array = listModel.selectedIndices;
-               var locationInSelectionList:int = indices.indexOf(event.index);
-               if (locationInSelectionList < 0)
-               {
-                   indices.push(event.index);
-               } else
-               {
-                   indices.removeAt(locationInSelectionList);
-               }
-               listModel.selectedIndices = indices;
-            }
-            listView.host.dispatchEvent(new Event("change"));
-        }
-		
+		{
+			var selectedIndices:Array = [];
+			if (!event.multipleSelection || !listModel.selectedIndices)
+			{
+				listModel.selectedIndices = [event.index];
+			} else
+			{
+				// concat is so we have a new instance, avoiding code that might presume no change was made according to instance
+				var indices:Array = listModel.selectedIndices.concat();
+				var locationInSelectionList:int = indices.indexOf(event.index);
+				if (locationInSelectionList < 0)
+				{
+					indices.push(event.index);
+				} else
+				{
+					indices.removeAt(locationInSelectionList);
+				}
+				listModel.selectedIndices = indices;
+			}
+			listView.host.dispatchEvent(new Event("change"));
+		}
+
 		/**
 		 * @royaleemitcoercion org.apache.royale.core.ISelectableItemRenderer
-         * @royaleignorecoercion org.apache.royale.core.IRollOverModel
+		 * @royaleignorecoercion org.apache.royale.core.IRollOverModel
 		 */
 		protected function rolloverHandler(event:Event):void
 		{
@@ -166,10 +167,10 @@ package org.apache.royale.html.beads.controllers
 				IRollOverModel(listModel).rollOverIndex = renderer.index;
 			}
 		}
-		
+
 		/**
 		 * @royaleemitcoercion org.apache.royale.core.ISelectableItemRenderer
-         * @royaleignorecoercion org.apache.royale.core.IRollOverModel
+		 * @royaleignorecoercion org.apache.royale.core.IRollOverModel
 		 */
 		protected function rolloutHandler(event:Event):void
 		{
@@ -180,6 +181,6 @@ package org.apache.royale.html.beads.controllers
 				IRollOverModel(listModel).rollOverIndex = -1;
 			}
 		}
-	
+
 	}
 }