fit-ui 2.4.1 → 2.5.3

package/dist/Fit.UI.js

@@ -648,7 +648,7 @@ Fit._internal =
 {
 	Core:
 	{
-		VersionInfo: { Major: 2, Minor: 4, Patch: 1 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
+		VersionInfo: { Major: 2, Minor: 5, Patch: 3 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
 	}
 };
 
@@ -3048,6 +3048,8 @@ Fit.Controls.Component = function(controlId)
 		container = document.createElement("div");
 		container.id = id;
 		container._internal = { Instance: me };
+
+		Fit.Dom.Data(container, "device", ((Fit.Browser.GetInfo().IsMobile === false) ? "Desktop" : (Fit.Browser.GetInfo().IsPhone === true) ? "Phone" : "Tablet"));
 	}
 
 	/// <function container="Fit.Controls.Component" name="GetId" access="public" returns="string">
@@ -3278,8 +3280,6 @@ Fit.Controls.ControlBase = function(controlId)
 		me._internal.Data("dirty", "false");
 		me._internal.Data("enabled", "true");
 
-		me._internal.Data("device", ((Fit.Browser.GetInfo().IsMobile === false) ? "Desktop" : (Fit.Browser.GetInfo().IsPhone === true) ? "Phone" : "Tablet"));
-
 		// Add hidden inputs which are automatically populated with
 		// control value and state information when control is updated.
 
@@ -15924,8 +15924,15 @@ Fit.Controls.DropDown = function(ctlId)
 			{
 				var target = Fit.Events.GetTarget(e);
 
+				if (target !== document.documentElement && target !== document.body && Fit.Dom.IsRooted(target) === false)
+				{
+					return; // Do not close DropDown if target no longer exists - this may happen if something is removed within DropDown (e.g. an item in the WSDropDown's action menu)
+				}
+
 				if (me.IsDropDownOpen() === true && target !== me.GetDomElement() && Fit.Dom.Contained(me.GetDomElement(), target) === false)
+				{
 					me.CloseDropDown();
+				}
 			});
 			Fit.Array.Add(closeHandlers, eventId);
 		}
@@ -15942,6 +15949,11 @@ Fit.Controls.DropDown = function(ctlId)
 
 				coords = null;
 
+				if (target !== document.documentElement && target !== document.body && Fit.Dom.IsRooted(target) === false)
+				{
+					return; // Do not close DropDown if target no longer exists - this may happen if something is removed within DropDown (e.g. an item in the WSDropDown's action menu)
+				}
+
 				if (me.IsDropDownOpen() === true && target !== me.GetDomElement() && Fit.Dom.Contained(me.GetDomElement(), target) === false)
 				{
 					coords = Fit.Events.GetPointerState().Coordinates.Document;
@@ -16532,6 +16544,19 @@ Fit.Controls.DropDown = function(ctlId)
 				if (txt.parentElement.parentElement === null)
 					txt = txtPrimary;
 			}
+			else
+			{
+				// User selected an item which is already selected
+
+				if (me.TextSelectionMode() === true)
+				{
+					updateTextSelection(); // Make sure any search value is removed and text selection is restored
+				}
+				else
+				{
+					me.ClearInput(); // Make sure any search value is removed
+				}
+			}
 
 			// DISABLED: Now handled using picker.OnFocus(..) handler further down - see https://github.com/Jemt/Fit.UI/issues/86 for details
 			// if (eventArgs.ProgrammaticallyChanged === false && (isMobile === false || focusInputOnMobile === true))
@@ -17152,9 +17177,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 		inp.value = "";
 
-		Fit.Dom.Data(inp.parentElement, "editing", null);
-		Fit.Dom.Data(inp, "editing", null);
-		me._internal.Repaint();
+		setInputEditing(inp, false);
 
 		if (inp === txtActive)
 			prevValue = "";
@@ -17174,22 +17197,31 @@ Fit.Controls.DropDown = function(ctlId)
 	{
 		Fit.Validation.ExpectString(val);
 
-		if (txtActive.value === val)
-			return;
+		var txt = txtActive;
+		var fireOnChange = txt.value !== val;
 
-		txtActive.value = "";
+		if (focusAssigned === false && txt !== txtPrimary)
+		{
+			// DropDown does not have focus, and the currently active input field
+			// is not the primary one. Change it to the primary input field instead.
 
-		Fit.Dom.Data(txtActive.parentElement, "editing", val !== "" ? "true" : null);
-		Fit.Dom.Data(txtActive, "editing", val !== "" ? "true" : null);
-		me._internal.Repaint();
+			// Clear active input field in case it has a value
+			txtActive.value = "";
+			setInputEditing(txtActive, false);
+
+			txt = txtPrimary;
+			txtActive = txtPrimary;
+		}
 
-		var txt = ((focusAssigned === true) ? txtActive : txtPrimary);
+		setInputEditing(txt, val !== "");
 
 		txt.value = val;
 		prevValue = val;
-		txtActive = txt;
 
-		fireOnInputChanged(txt.value);
+		if (fireOnChange === true)
+		{
+			fireOnInputChanged(txt.value);
+		}
 	}
 
 	/// <function container="Fit.Controls.DropDown" name="GetInputValue" access="public" returns="string">
@@ -17229,6 +17261,11 @@ Fit.Controls.DropDown = function(ctlId)
 		if (Fit._internal.DropDown.Current !== null && Fit._internal.DropDown.Current !== me)
 			Fit._internal.DropDown.Current.CloseDropDown();
 
+		if (txtActive === txtPrimary && me.GetInputValue() === "")
+		{
+			me._internal.UndoClearInputForSearch();
+		}
+
 		// Do this before displaying drop down to prevent dropdown with position:absolute
 		// from changing height of document which may cause page to temporarily scroll, hence
 		// result in incorrect measurement of control position in optimizeDropDownPosition().
@@ -17403,6 +17440,53 @@ Fit.Controls.DropDown = function(ctlId)
 		Fit.Array.Add(onCloseHandlers, cb);
 	}
 
+	// ============================================
+	// Protected
+	// ============================================
+
+	this._internal = (this._internal ? this._internal : {});
+
+	this._internal.ClearInputForSearch = function()
+	{
+		if (me.TextSelectionMode() === true)
+		{
+			forceFocusInput(txtPrimary);
+			txtPrimary.value = "";
+			updatePlaceholder(true);
+		}
+		else
+		{
+			forceFocusInput(txtPrimary);
+			me.ClearInput();
+			setInputEditing(txtPrimary, true);
+		}
+
+		// If DropDown is in Visual Selection Mode, the search field is now displayed
+		// on a separate "line" (see code above where setInputEditing(..) is called).
+		// When that input field lose focus, it will immediately return to its normal
+		// state. This results in the control's height changing which in turn results
+		// in the pulldown menu moving up. So if a user clicks an item in the pulldown
+		// menu, the input lose focus, the position of the pulldown menu changes, and
+		// nothing happens from the click because the picker uses a traditional onclick
+		// event to register interactions, which doesn't fire unless the mouse button is released
+		// on the same object it was pressed down on. We avoid this by closing the control.
+		// We close it in both Text Selection Mode and Visual Selection Mode for consistency.
+		me.CloseDropDown();
+	}
+
+	this._internal.UndoClearInputForSearch = function()
+	{
+		if (me.TextSelectionMode() === true)
+		{
+			updateTextSelection(); // Also removes placeholder by calling updatePlaceholder(true)
+		}
+		else
+		{
+			me.ClearInput();
+			setInputEditing(txtPrimary, false);
+		}
+	}
+
 	// ============================================
 	// Private
 	// ============================================
@@ -17439,9 +17523,7 @@ Fit.Controls.DropDown = function(ctlId)
 				prevValue = txt.value;
 				var pastedValue = txt.value;
 
-				Fit.Dom.Data(txt.parentElement, "editing", "true");
-				Fit.Dom.Data(txt, "editing", "true");
-				me._internal.Repaint();
+				setInputEditing(txt, true);
 
 				if (fireOnPaste(txt.value) === true)
 				{
@@ -17521,9 +17603,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 			if (txt.value === "")
 			{
-				Fit.Dom.Data(txt.parentElement, "editing", null);
-				Fit.Dom.Data(txt, "editing", null);
-				me._internal.Repaint();
+				setInputEditing(txt, false);
 			}
 		}
 
@@ -17654,6 +17734,11 @@ Fit.Controls.DropDown = function(ctlId)
 
 				if (txt.value.length === 0)
 				{
+					if (txt === txtPrimary)
+					{
+						me._internal.UndoClearInputForSearch();
+					}
+
 					if (Fit.Browser.GetInfo().Name === "MSIE")
 						Fit.Events.PreventDefault(ev); // Do not navigate back on IE when backspace is pressed within input being removed
 
@@ -17723,9 +17808,7 @@ Fit.Controls.DropDown = function(ctlId)
 		{
 			updatePlaceholder(true, true); // Make sure placeholder is removed immediately on keystroke
 
-			Fit.Dom.Data(txt.parentElement, "editing", "true");
-			Fit.Dom.Data(txt, "editing", "true");
-			me._internal.Repaint();
+			setInputEditing(txt, true);
 		}
 
 		txt.onkeyup = function(e) // Fires only once when a key is released (unless suppressed in OnKeyDown)
@@ -17842,6 +17925,44 @@ Fit.Controls.DropDown = function(ctlId)
 			txtActive.focus(); // Notice: Input field's onfocus handler will move focus to txtPrimary if this is the last selection's right side input field - on mobile it might redirect focus to the arrow icon to avoid bringing up the virtual keyboard
 	}
 
+	function forceFocusInput(input)
+	{
+		Fit.Validation.ExpectInstance(input, HTMLInputElement);
+
+		// By default focus is never assigned to input on mobile if user opened the
+		// DropDown by clicking the arrow icon. ForceFocusInput allows us to ignore this
+		// aspect. On desktop the input field always remains focused  as it automatically
+		// steals back focus immediately after interacting with a picker control. See
+		// picker.OnFocusIn handler registered in SetPicker(..)
+		var orgFocusInputOnMobile = focusInputOnMobile;
+		focusInputOnMobile = true;
+		focusInput(input);
+		focusInputOnMobile = orgFocusInputOnMobile;
+	}
+
+	function setInputEditing(input, val, keepStateOnParent)
+	{
+		Fit.Validation.ExpectInstance(input, HTMLInputElement);
+		Fit.Validation.ExpectBoolean(val);
+		Fit.Validation.ExpectBoolean(keepStateOnParent, true);
+
+		if (keepStateOnParent !== true)
+		{
+			Fit.Dom.Data(input.parentElement, "editing", val === true ? "true" : null);
+		}
+
+		Fit.Dom.Data(input, "editing", val === true ? "true" : null);
+
+		if (input === txtPrimary)
+		{
+			// DropDown's placeholder is only displayed when no items are selected.
+			// Therefore, use native placeholder for input if items are selected.
+			txtPrimary.placeholder = val === true && me.GetSelections().length > 0 ? me.Placeholder() : "";
+		}
+
+		me._internal.Repaint();
+	}
+
 	function clearAllInputsButActive()
 	{
 		var inputs = itemContainer.getElementsByTagName("input");
@@ -17851,9 +17972,16 @@ Fit.Controls.DropDown = function(ctlId)
 			if (input === txtActive)
 				return;
 
-			if ((txtActive.parentElement === itemContainer && input === txtPrimary) || (txtActive.parentElement !== itemContainer && Fit.Dom.Contained(txtActive.parentElement, input) === false))
-				Fit.Dom.Data(input.parentElement, "editing", null);
-			Fit.Dom.Data(input, "editing", null);
+			if (txtActive.parentElement === input.parentElement)
+			{
+				// Input is contained in a selected object whose other input is txtActive.
+				// Do not remove editing state from parent element in this case - keep it!
+				setInputEditing(input, false, true);
+			}
+			else
+			{
+				setInputEditing(input, false);
+			}
 
 			me.ClearInput(input);
 		});
@@ -18182,7 +18310,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 		if (placeholder !== "" || force === true)
 		{
-			var setPlaceholder = placeholder !== "" && itemCollectionOrdered.length === 0 && me.GetInputValue() === "" && willAssumeInputValue !== true;
+			var setPlaceholder = placeholder !== "" && (me.TextSelectionMode() === true || itemCollectionOrdered.length === 0) && me.GetInputValue() === "" && willAssumeInputValue !== true;
 
 			Fit.Dom.Data(itemContainer, "placeholder", setPlaceholder === true ? placeholder : null);
 			Fit.Dom.Data(itemContainer, "placeholder-autoclear", setPlaceholder === true ? Fit.Browser.GetBrowser() === "MSIE" ? "true" : "false" : null);
@@ -18396,6 +18524,12 @@ Fit.Controls.DropDown = function(ctlId)
 			Fit.Dom.SetCaretPosition(txtPrimary, 0);
 		}
 
+		// Remove placeholder in case it was added using this._internal.ClearInputForSearch()
+
+		updatePlaceholder(true);
+
+		// Have TextSelection removed when input is changed
+
 		clearTextSelectionOnInputChange = true;
 	}
 
@@ -19027,12 +19161,14 @@ Fit.Controls.WSDropDown = function(ctlId)
 	var me = this;
 	var list = null;
 	var tree = null;
+	var actionMenu = null;
 
 	var search = "";
 	var forceNewSearch = false;
 	var hideLinesForFlatData = true;
 	var dataRequested = false;		// Flag indicating whether TreeView data has been requested or not - determines whether a call to ensureTreeViewData() actually loads data or not
 	var dataLoading = false;		// Flag indicating whether TreeView data is currently being loaded by WSDropDown internals (awaiting response) - will not be True when user expand nodes to load children, or when invoking e.g. dd.GetTreeView.Reload()
+	var nodesPopulated = false;		// Flag indicating whether TreeView root nodes have been populated - contrary to dataLoading this flag is set when a potentially partial portion of the data has been loaded
 	var requestCount = 0;			// Counter to keep track of nodes for which data is currently being loaded, no matter how it was being loaded (via WSDropDown internals, programmatically on WSTreeView from external code, or by user expanding nodes)
 	var onDataLoadedCallback = [];
 	var suppressTreeOnOpen = false;
@@ -19040,6 +19176,10 @@ Fit.Controls.WSDropDown = function(ctlId)
 	var currentRequest = null;
 	var classes = null;
 	var autoUpdatedSelections = null; // Cached result from AutoUpdateSelected: [{ Title:string, Value:string, Exists:boolean }, ...]
+	var useActionMenu = false;
+	var useActionMenuForced = false;
+	var useActionMenuAfterLoad = true;
+	var translations = null;
 
 	var onRequestHandlers = [];
 	var onResponseHandlers = [];
@@ -19063,7 +19203,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 
 		// Create ListView
 
-		list = new Fit.Controls.WSListView(ctlId + "__WSListView");
+		list = new Fit.Controls.WSListView(me.GetId() + "__WSListView");
 		list.OnRequest(function(sender, eventArgs)
 		{
 			if (fireEventHandlers(onRequestHandlers, list, eventArgs) === false)
@@ -19115,7 +19255,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 
 		// Create TreeView
 
-		tree = new Fit.Controls.WSTreeView(ctlId + "__WSTreeView");
+		tree = new Fit.Controls.WSTreeView(me.GetId() + "__WSTreeView");
 		tree.Selectable(true); // Make nodes selectable by default when added
 		tree.Width(100, "%");
 		//tree.Lines(true); // DISABLED - lines do not scale with font size
@@ -19175,6 +19315,30 @@ Fit.Controls.WSDropDown = function(ctlId)
 		});
 		tree.OnPopulated(function(sender, eventArgs)
 		{
+			nodesPopulated = true;
+
+			// If no data is returned and DropDown is in TextSelectionMode, the user will
+			// not be able to remove objects from the DropDown, unless SelectionModeToggle
+			// is true. Therefore we allow for items to be removed using an action menu.
+			// EDIT: Now displays action menu in both Visual and Text Selection Mode for consistency.
+
+			if (useActionMenuForced === false)
+			{
+				useActionMenu = tree.GetChildren().length === 0;
+			}
+
+			if (/*me.TextSelectionMode() === true &&*/ useActionMenu === true)
+			{
+				updateActionMenu();
+
+				if (useActionMenuAfterLoad === true || tree.GetChildren().length === 0)
+				{
+					me.SetPicker(actionMenu);
+				}
+			}
+
+			// Helper lines
+
 			if (hideLinesForFlatData === true && tree.Lines() === true) // Lines are off by default but might have been enabled like so: dd.GetTreeView().Lines(true)
 			{
 				// Disable helper lines if no children are contained
@@ -19245,6 +19409,109 @@ Fit.Controls.WSDropDown = function(ctlId)
 				me.SetPicker(tree);
 		});
 
+		// Create action menu
+
+		var skipUpdateActionMenuOnChange = false;
+
+		actionMenu = new Fit.Controls.ListView(me.GetId() + "__ActionsListView");
+		actionMenu.OnSelect(function(sender, item) // Using OnSelect instead of OnItemSelectionChanging since DropDown fires OnItemSelectionChanging when selection is changed, which would result in OnItemSelectionChanging being executed multiple times
+		{
+			if (item.Value === "SearchMore")
+			{
+				me._internal.ClearInputForSearch();
+			}
+			else if (item.Value === "ShowAll")
+			{
+				me._internal.UndoClearInputForSearch(); // In case user first picked SearchMore, changed their mind, and then selected ShowAll
+
+				useActionMenuAfterLoad = false;
+
+				me.SetPicker(tree);
+				ensureTreeViewData();
+			}
+			else if (item.Value === "RemoveAll")
+			{
+				skipUpdateActionMenuOnChange = true;
+				me.ClearSelections(); // Fires OnChange
+				skipUpdateActionMenuOnChange = false;
+
+				updateActionMenu(); // Update action menu (remove all "Remove: xyz" options)
+			}
+			else if (item.Value.indexOf("Remove:") === 0)
+			{
+				var dataValue = item.Value.replace("Remove:", "");
+
+				// Find item below if using keyboard to remove item
+
+				var above = null;
+				var below = null;
+
+				if (Fit.Browser.GetInfo().IsMobile === false && Fit.Events.GetPointerState().Buttons.Primary === false) // Do not find and highlight item below on touch devices, or if using the mouse
+				{
+					var items = actionMenu.GetItems();
+					var stopNext = false;
+
+					for (var i = 0 ; i < items.length ; i++)
+					{
+						if (items[i].Value.indexOf("Remove:") !== 0)
+						{
+							continue; // Skip items that do not remove individual selections
+						}
+
+						if (items[i].Value.replace("Remove:", "") === dataValue)
+						{
+							stopNext = true;
+							continue;
+						}
+
+						if (stopNext === false)
+						{
+							above = items[i].Value;
+						}
+						else
+						{
+							below = items[i].Value;
+							break;
+						}
+					}
+				}
+
+				// Remove item
+
+				skipUpdateActionMenuOnChange = true;
+				me.RemoveSelection(dataValue); // Fires OnChange
+				skipUpdateActionMenuOnChange = false;
+
+				// Update list of removable items
+
+				actionMenu.RemoveItem(item.Value);
+
+				if (me.GetSelections().length === 1)
+				{
+					updateActionMenu(); // Update action menu to get rid of "Remove all" item when only one item is left
+				}
+
+				// Highlight item below (or above) the item that was just removed
+
+				if (above !== null || below !== null)
+				{
+					actionMenu.RevealItemInView(below !== null ? below : above);
+				}
+			}
+
+			return false; // Prevent selection of behavioural item
+		});
+
+		me.OnChange(function(sender)
+		{
+			if (skipUpdateActionMenuOnChange === false)
+			{
+				updateActionMenu();
+			}
+		});
+
+		// Misc
+
 		me.OnOpen(function()
 		{
 			if (suppressTreeOnOpen === true)
@@ -19253,9 +19520,29 @@ Fit.Controls.WSDropDown = function(ctlId)
 				return;
 			}
 
-			me.SetPicker(tree);
-			ensureTreeViewData();
+			// Do not show action menu if the only option available is ShowAll.
+			// In this case the user will not be able to select SeachMore, and
+			// there is no selected items that can be removed from the control.
+			var onlyShowAllOptionDisplayedInActionMenu = actionMenu.GetItems().length === 1 && actionMenu.HasItem("ShowAll") === true;
+
+			if (useActionMenu === true && onlyShowAllOptionDisplayedInActionMenu === false)
+			{
+				me.SetPicker(actionMenu);
+			}
+			else
+			{
+				if (onlyShowAllOptionDisplayedInActionMenu === true)
+				{
+					useActionMenuAfterLoad = false;
+				}
+
+				me.SetPicker(tree);
+				ensureTreeViewData();
+			}
 		});
+
+		Fit.Internationalization.OnLocaleChanged(localize);
+		localize();
 	}
 
 	// ============================================
@@ -19319,6 +19606,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 		}
 
 		dataLoading = true;
+		nodesPopulated = false;
 
 		var ensure = function()
 		{
@@ -19464,10 +19752,6 @@ Fit.Controls.WSDropDown = function(ctlId)
 		}
 	}
 
-	/// <function container="Fit.Controls.WSDropDown" name="MultiSelectionMode" access="public" returns="boolean">
-	/// 	<description> Get/set value indicating whether control allows for multiple selections simultaneously </description>
-	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for multiple selections, False disables it </param>
-	/// </function>
 	this.MultiSelectionMode = Fit.Core.CreateOverride(this.MultiSelectionMode, function(val)
 	{
 		Fit.Validation.ExpectBoolean(val, true);
@@ -19480,6 +19764,18 @@ Fit.Controls.WSDropDown = function(ctlId)
 		return base(val);
 	});
 
+	this.InputEnabled = Fit.Core.CreateOverride(this.InputEnabled, function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true && base() !== val)
+		{
+			base(val);
+			updateActionMenu(); // Update action menu to have SearchMore action added/removed depending on whether input is allowed or not
+		}
+
+		return base();
+	});
 
 	/// <function container="Fit.Controls.WSDropDown" name="GetListView" access="public" returns="Fit.Controls.WSListView">
 	/// 	<description> Get WSListView control used to display data in a flat list view </description>
@@ -19497,6 +19793,44 @@ Fit.Controls.WSDropDown = function(ctlId)
 		return tree;
 	}
 
+	/// <function container="Fit.Controls.WSDropDown" name="UseActionMenu" access="public">
+	/// 	<description> Get/set value indicating whether control uses the built-in action menu to ease addition and removal of items </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables the action menu, False disables it </param>
+	/// </function>
+	this.UseActionMenu = function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true)
+		{
+			useActionMenuForced = true;
+
+			if (val !== useActionMenu)
+			{
+				useActionMenu = val;
+
+				if (val === true)
+				{
+					updateActionMenu();
+
+					if (me.IsDropDownOpen() === true)
+					{
+						me.SetPicker(actionMenu);
+					}
+				}
+				else
+				{
+					if (me.GetPicker() === actionMenu)
+					{
+						me.SetPicker(tree.GetChildren().length > 0 ? tree : list);
+					}
+				}
+			}
+		}
+
+		return useActionMenu;
+	}
+
 	// See documentation on ControlBase
 	this.Dispose = Fit.Core.CreateOverride(this.Dispose, function()
 	{
@@ -19504,10 +19838,13 @@ Fit.Controls.WSDropDown = function(ctlId)
 
 		list.Destroy();
 		tree.Destroy();
+		actionMenu.Destroy();
 
 		cancelSearch();
 
-		me = list = tree = search = forceNewSearch = hideLinesForFlatData = dataRequested = dataLoading = requestCount = onDataLoadedCallback = suppressTreeOnOpen = timeOut = currentRequest = classes = autoUpdatedSelections = onRequestHandlers = onResponseHandlers = null;
+		Fit.Internationalization.RemoveOnLocaleChanged(localize);
+
+		me = list = tree = actionMenu = search = forceNewSearch = hideLinesForFlatData = dataRequested = dataLoading = nodesPopulated = requestCount = onDataLoadedCallback = suppressTreeOnOpen = timeOut = currentRequest = classes = autoUpdatedSelections = useActionMenu = useActionMenuForced = useActionMenuAfterLoad = translations = onRequestHandlers = onResponseHandlers = null;
 
 		base();
 	});
@@ -19634,6 +19971,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 		if (dataRequested === false)
 		{
 			dataLoading = true;
+			nodesPopulated = false;
 
 			tree.Reload(true, function(sender)
 			{
@@ -19698,6 +20036,55 @@ Fit.Controls.WSDropDown = function(ctlId)
 		}
 	}
 
+	function updateActionMenu()
+	{
+		if (useActionMenu === false)
+		{
+			return;
+		}
+
+		var searchIcon = "<span class='FitUiControlDropDownActionMenuItemIcon FitUiControlDropDownActionMenuItemIconSearch fa fa-search'></span> ";
+		var showAllIcon = "<span class='FitUiControlDropDownActionMenuItemIcon FitUiControlDropDownActionMenuItemIconShowAll fa fa-sitemap'></span> ";
+		var delIcon = "<span class='FitUiControlDropDownActionMenuItemIcon FitUiControlDropDownActionMenuItemIconDelete fa fa-times'></span> ";
+
+		var selectedItems = me.GetSelections();
+		var addRemoveAll = selectedItems.length > 1;
+
+		actionMenu.RemoveItems();
+
+		if (me.InputEnabled() === true)
+		{
+			actionMenu.AddItem(searchIcon + translations.SearchMore, "SearchMore");
+		}
+
+		if (nodesPopulated === false || tree.GetChildren().length > 0)
+		{
+			actionMenu.AddItem(showAllIcon + translations.ShowAllOptions, "ShowAll");
+		}
+		else //if (nodesPopulated === true && tree.GetChildren().length === 0)
+		{
+			actionMenu.AddItem(showAllIcon + "<i>" + translations.NoneAvailable + ": " + translations.ShowAllOptions + "</i>", "ShowAllNoneFound");
+		}
+
+		if (addRemoveAll === true)
+		{
+			actionMenu.AddItem(delIcon + translations.RemoveAll, "RemoveAll");
+		}
+
+		Fit.Array.ForEach(selectedItems, function(item)
+		{
+			actionMenu.AddItem((addRemoveAll === true ? " &nbsp; &nbsp; &nbsp; " : "") + delIcon + translations.Remove + " " + item.Title, "Remove:" + item.Value);
+		});
+	}
+
+	function localize()
+	{
+		var locale = Fit.Internationalization.GetLocale(me);
+		translations = locale.Translations;
+
+		updateActionMenu();
+	}
+
 	function onDataLoaded(cb)
 	{
 		Fit.Validation.ExpectFunction(cb);
@@ -19775,31 +20162,49 @@ Fit.Controls.WSDropDown = function(ctlId)
 		// All locales inherit from en. All country specific overrides inherit
 		// from their primary locale (e.g. de_AT inherits from de).
 		// English (en) MUST be defined!
-		
+
 		"en": // US
 		{
 			Translations:
 			{
-				InvalidSelection		: "Invalid selection"
+				InvalidSelection		: "Invalid selection",
+
+				SearchMore				: "Search for more options",
+				ShowAllOptions			: "Show all available options",
+				RemoveAll				: "Remove all selected",
+				Remove					: "Remove",
+				NoneAvailable			: "None available"
 			}
 		},
 		"da":
 		{
 			Translations:
 			{
-				InvalidSelection		: "Ugyldigt valg"
+				InvalidSelection		: "Ugyldigt valg",
+
+				SearchMore				: "Søg efter flere valgmuligheder",
+				ShowAllOptions			: "Vis alle tilgængelige valgmuligheder",
+				RemoveAll				: "Fjern alle valgte",
+				Remove					: "Fjern",
+				NoneAvailable			: "Ingen tilgængelige"
 			}
 		},
 		"de":
 		{
 			Translations:
 			{
-				InvalidSelection		: "Ungültige Auswahl"
+				InvalidSelection		: "Ungültige Auswahl",
+
+				SearchMore				: "Nach weiteren Optionen suchen",
+				ShowAllOptions			: "Alle verfügbaren Optionen anzeigen",
+				RemoveAll				: "Alle ausgewählten entfernen",
+				Remove					: "Entfernen",
+				NoneAvailable			: "Keine verfügbar"
 			}
 		}
 	}
 	Fit.Internationalization.AddLocalization(Fit.Controls.DropDown, locale);
-	Fit.Internationalization.AddLocalization(Fit.Controls.WSDropDown, locale);	
+	Fit.Internationalization.AddLocalization(Fit.Controls.WSDropDown, locale);
 })();
 /// <container name="Fit.Controls.FilePicker" extends="Fit.Controls.ControlBase">
 /// 	Control allowing for files to be selected locally and uploaded asynchronously.
@@ -22710,6 +23115,9 @@ Fit.Controls.ListView = function(controlId)
 	var firstWasHighlighted = false;
 	var isIe8 = (Fit.Browser.GetInfo().Name === "MSIE" && Fit.Browser.GetInfo().Version === 8);
 
+	var onSelectHandlers = [];
+	var onSelectedHandlers = [];
+
 	function init()
 	{
 		list.tabIndex = "0";
@@ -22763,12 +23171,17 @@ Fit.Controls.ListView = function(controlId)
 
 			// Fire OnChanging and OnChange events
 
+			var item = convertItemElementToObject(elm);
+			var selectionCanceled = fireOnSelectHandlers(item) === false;
+
 			// Notice: We always pass False as current selection state to OnItemSelectionChanging since ListView does
 			// not keep track of selection state. In theory item could very well already be selected in host control.
 			// Event handlers should not trust boolean to reveal selection in host control, only in picker.
-			if (me._internal.FireOnItemSelectionChanging(Fit.Dom.Text(elm), decode(Fit.Dom.Data(elm, "value")), false, false) === true)
+			if (selectionCanceled === false && me._internal.FireOnItemSelectionChanging(item.Title, item.Value, false, false) === true)
 			{
-				me._internal.FireOnItemSelectionChanged(Fit.Dom.Text(elm), decode(Fit.Dom.Data(elm, "value")), true, false);
+				fireOnSelectedHandlers(item);
+
+				me._internal.FireOnItemSelectionChanged(item.Title, item.Value, true, false);
 				me._internal.FireOnItemSelectionComplete();
 			}
 		}
@@ -22888,6 +23301,21 @@ Fit.Controls.ListView = function(controlId)
 		return null;
 	}
 
+	/// <function container="Fit.Controls.ListView" name="GetItems" access="public" returns="Fit.Controls.ListViewTypeDefs.ListViewItem[]">
+	/// 	<description> Get all items - returns array containing objects with Title (string) and Value (string) properties </description>
+	/// </function>
+	this.GetItems = function()
+	{
+		var items = [];
+
+		Fit.Array.ForEach(list.children, function(child)
+		{
+			Fit.Array.Add(items, convertItemElementToObject(child));
+		});
+
+		return items;
+	}
+
 	/// <function container="Fit.Controls.ListView" name="HasItem" access="public" returns="boolean">
 	/// 	<description> Returns value indicating whether control contains item with specified value </description>
 	/// 	<param name="value" type="string"> Value of item to check for </param>
@@ -22911,6 +23339,11 @@ Fit.Controls.ListView = function(controlId)
 		if (item !== null)
 		{
 			Fit.Dom.Remove(item);
+
+			if (item === active)
+			{
+				active = null;
+			}
 		}
 	}
 
@@ -22974,12 +23407,17 @@ Fit.Controls.ListView = function(controlId)
 
 				if (active !== null)
 				{
+					var item = convertItemElementToObject(active);
+					var selectionCanceled = fireOnSelectHandlers(item) === false;
+
 					// Notice: We always pass False as current selection state to OnItemSelectionChanging since ListView does
 					// not keep track of selection state. In theory item could very well already be selected in host control.
 					// Event handlers should not trust boolean to reveal selection in host control, only in picker.
-					if (me._internal.FireOnItemSelectionChanging(Fit.Dom.Text(active), decode(Fit.Dom.Data(active, "value")), false, false) === true)
+					if (selectionCanceled === false && me._internal.FireOnItemSelectionChanging(item.Title, item.Value, false, false) === true)
 					{
-						me._internal.FireOnItemSelectionChanged(Fit.Dom.Text(active), decode(Fit.Dom.Data(active, "value")), true, false);
+						fireOnSelectedHandlers(item);
+
+						me._internal.FireOnItemSelectionChanged(item.Title, item.Value, true, false);
 						me._internal.FireOnItemSelectionComplete();
 					}
 				}
@@ -23038,6 +23476,47 @@ Fit.Controls.ListView = function(controlId)
 		return highlightFirst;
 	}
 
+	/// <function container="Fit.Controls.ListViewTypeDefs" name="OnSelectEventHandler" returns="boolean | void">
+	/// 	<description> OnSelect event handler </description>
+	/// 	<param name="sender" type="$TypeOfThis"> Instance of control </param>
+	/// 	<param name="item" type="{ Title: string, Value: string }"> Selected item </param>
+	/// </function>
+
+	/// <function container="Fit.Controls.ListView" name="OnSelect" access="public">
+	/// 	<description>
+	/// 		Register event handler fired when item is being selected.
+	/// 		Selection can be canceled by returning False.
+	/// 		The following arguments are passed to event handler function:
+	/// 		Sender (ListView) and Item (with Title (string) and Value (string) properties).
+	/// 	</description>
+	/// 	<param name="cb" type="Fit.Controls.ListViewTypeDefs.OnSelectEventHandler"> Event handler function </param>
+	/// </function>
+	this.OnSelect = function(cb)
+	{
+		Fit.Validation.ExpectFunction(cb);
+		Fit.Array.Add(onSelectHandlers, cb);
+	}
+
+	/// <function container="Fit.Controls.ListViewTypeDefs" name="OnSelectedEventHandler">
+	/// 	<description> OnSelected event handler </description>
+	/// 	<param name="sender" type="$TypeOfThis"> Instance of control </param>
+	/// 	<param name="item" type="{ Title: string, Value: string }"> Selected item </param>
+	/// </function>
+
+	/// <function container="Fit.Controls.ListView" name="OnSelected" access="public">
+	/// 	<description>
+	/// 		Register event handler fired when item is selected.
+	/// 		The following arguments are passed to event handler function:
+	/// 		Sender (ListView) and Item (with Title (string) and Value (string) properties).
+	/// 	</description>
+	/// 	<param name="cb" type="Fit.Controls.ListViewTypeDefs.OnSelectedEventHandler"> Event handler function </param>
+	/// </function>
+	this.OnSelected = function(cb)
+	{
+		Fit.Validation.ExpectFunction(cb);
+		Fit.Array.Add(onSelectedHandlers, cb);
+	}
+
 	this.Destroy = Fit.Core.CreateOverride(this.Destroy, function(calledInternally)
 	{
 		Fit.Validation.ExpectBoolean(calledInternally, true);
@@ -23063,7 +23542,7 @@ Fit.Controls.ListView = function(controlId)
 			me.Destroy(true); // PickerBase.Destroy()
 		}
 
-		me = list = active = persistView = scrollPositionTop = highlightFirst = firstWasHighlighted = isIe8 = null;
+		me = list = active = persistView = scrollPositionTop = highlightFirst = firstWasHighlighted = isIe8 = onSelectHandlers = onSelectedHandlers = null;
 	});
 
 	// ============================================
@@ -23175,6 +23654,37 @@ Fit.Controls.ListView = function(controlId)
 		}
 	}
 
+	function fireOnSelectHandlers(item)
+	{
+		Fit.Validation.ExpectObject(item);
+		Fit.Validation.ExpectString(item.Title);
+		Fit.Validation.ExpectString(item.Value);
+
+		var selectionCanceled = false;
+
+		Fit.Array.ForEach(onSelectHandlers, function(handler)
+		{
+			if (handler(me, item) === false)
+			{
+				selectionCanceled = true;
+			}
+		});
+
+		return selectionCanceled === true ? false : true; // Return False if canceled
+	}
+
+	function fireOnSelectedHandlers(item)
+	{
+		Fit.Validation.ExpectObject(item);
+		Fit.Validation.ExpectString(item.Title);
+		Fit.Validation.ExpectString(item.Value);
+
+		Fit.Array.ForEach(onSelectedHandlers, function(handler)
+		{
+			handler(me, item);
+		});
+	}
+
 	function repaint()
 	{
 		if (isIe8 === true)