fit-ui 2.17.2 → 2.18.0

package/dist/Fit.UI.css

@@ -5066,6 +5066,12 @@ div.FitUiControlTreeView li ul li > span
 	cursor: pointer;
 }
 
+div.FitUiControlTreeView[data-htmlallowed="true"] li ul li > span
+{
+	display: inline-block;
+	line-height: normal;
+}
+
 /* Indent node title if checkboxes are enabled.
    Notice: Node title is ALWAYS indented if TreeView is in Multi Selection mode, to make sure node titles are always vertically aligned
            if some nodes have checkboxes, and some do not. It looks odd If all checkboxes are disabled, though, since it leaves a big gap.

package/dist/Fit.UI.js

@@ -682,7 +682,7 @@ Fit._internal =
 {
 	Core:
 	{
-		VersionInfo: { Major: 2, Minor: 17, Patch: 2 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
+		VersionInfo: { Major: 2, Minor: 18, Patch: 0 } // Do NOT modify format - version numbers are programmatically changed when releasing new versions - MUST be on a separate line!
 	}
 };
 
@@ -5370,7 +5370,10 @@ Fit.String.StripHtml = function(str)
 {
 	Fit.Validation.ExpectString(str);
 
-	return str.replace(/(<([^>]+)>)/g, "");
+	return str.replace(/<\/?[a-zA-Z][^>]*>/g, "");
+
+	// Disabled - a value such as "A < B > C" will have "< B >" removed which is not desirable
+	//return str.replace(/(<([^>]+)>)/g, "");
 
 	// Disabled - whitespaces are not preserved!
 	/*var span = document.createElement("span");
@@ -17306,6 +17309,7 @@ Fit.Controls.DropDown = function(ctlId)
 	var itemCollection = {};					// Indexed collection for selected items (for fast lookup)
 	var itemCollectionOrdered = [];				// Ordered item collection (item order can be changed using drag and drop)
 	var itemDropZones = {};						// Indexed collection of dropzones used to enable item dragging/dropping
+	var htmlAllowed = false;					// Flag indicating whether HTML is allowed (shown) in selected items
 	var placeholder = "";						// Placeholder value displayed when no selection is made
 	var arrow = null;							// Arrow button used to open/close drop down menu
 	var txtPrimary = null;						// Primary input (search) field initially available
@@ -17908,13 +17912,36 @@ Fit.Controls.DropDown = function(ctlId)
 			Fit.Events.RemoveHandler(onScrollElement, onScrollEventId);
 		}
 
-		me = itemContainer = itemCollection = itemDropZones = arrow = txtPrimary = txtActive = txtEnabled = dropDownMenu = picker = orgSelections = invalidMessage = invalidMessageChanged = initialFocus = maxHeight = prevValue = focusAssigned = closeHandlers = dropZone = isMobile = focusInputOnMobile = detectBoundaries = detectBoundariesRelToViewPort = persistView = highlightFirst = searchModeOnFocus = onScrollElement = onScrollEventId = cancelEventRegistrationOnOpen = onInputChangedHandlers = onPasteHandlers = onOpenHandlers = onCloseHandlers = suppressUpdateItemSelectionState = suppressOnItemSelectionChanged = clearTextSelectionOnInputChange = prevTextSelection = textSelectionCallback = cmdToggleTextMode = null;
+		me = itemContainer = itemCollection = itemCollectionOrdered = itemDropZones = htmlAllowed = placeholder = arrow = txtPrimary = txtActive = txtEnabled = dropDownMenu = picker = orgSelections = invalidMessage = invalidMessageChanged = initialFocus = maxHeight = maxWidth = prevValue = focusAssigned = closeHandlers = dropZone = isMobile = focusInputOnMobile = detectBoundaries = detectBoundariesRelToViewPort = persistView = highlightFirst = searchModeOnFocus = onScrollElement = onScrollEventId = cancelEventRegistrationOnOpen = onInputChangedHandlers = onPasteHandlers = onOpenHandlers = onCloseHandlers = suppressUpdateItemSelectionState = suppressOnItemSelectionChanged = clearTextSelectionOnInputChange = prevTextSelection = textSelectionCallback = cmdToggleTextMode = null;
 
 		base();
 	});
 
 	// Misc. options
 
+	/// <function container="Fit.Controls.DropDown" name="HtmlAllowed" access="public" returns="boolean">
+	/// 	<description> Get/set value indicating whether HTML is allowed (shown) in selected items </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for HTML, False disables it </param>
+	/// </function>
+	this.HtmlAllowed = function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true && htmlAllowed !== val)
+		{
+			htmlAllowed = val;
+
+			// Update view - RenameSelection(..) will enable/disable HTML depending on htmlAllowed (set above)
+
+			Fit.Array.ForEach(itemCollectionOrdered, function(item)
+			{
+				me.RenameSelection(item.Value, item.Title);
+			});
+		}
+
+		return htmlAllowed;
+	}
+
 	/// <function container="Fit.Controls.DropDown" name="Placeholder" access="public" returns="string">
 	/// 	<description> Get/set value used as a placeholder on supported browsers, to indicate expected value or action </description>
 	/// 	<param name="val" type="string" default="undefined"> If defined, value is set as placeholder </param>
@@ -18391,9 +18418,8 @@ Fit.Controls.DropDown = function(ctlId)
 		}
 
 		// Add title and delete button to title box
-		var titleWithoutHtml = Fit.String.StripHtml(title);
-		var textNode = document.createTextNode(titleWithoutHtml);
-		Fit.Dom.Add(item, textNode);
+		var titleNode = me.HtmlAllowed() === false ? document.createTextNode(Fit.String.StripHtml(title)) : Fit.Dom.CreateElement(title);
+		Fit.Dom.Add(item, titleNode);
 		Fit.Dom.Add(item, cmdDelete);
 
 		// Add elements to item container
@@ -18414,7 +18440,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 		itemContainer.insertBefore(container, before);
 
-		var itemObject = createItemObject(titleWithoutHtml, value, valid !== false, item, textNode); //convertItemElementToItemObject(item);
+		var itemObject = createItemObject(title, value, valid !== false, item, titleNode); //convertItemElementToItemObject(item);
 		itemCollection[itemObject.Value] = itemObject;
 		itemCollectionOrdered.push(itemObject);
 
@@ -18578,14 +18604,19 @@ Fit.Controls.DropDown = function(ctlId)
 
 		var selection = itemCollection[val] || null;
 
-		if (selection !== null && selection.Title !== newTitle)
+		if (selection !== null)
 		{
-			var titleWithoutHtml = Fit.String.StripHtml(newTitle);
+			var orgTitle = selection.Title;
+			var newTitleNode = me.HtmlAllowed() === false ? document.createTextNode(Fit.String.StripHtml(newTitle)) : Fit.Dom.CreateElement(newTitle);
 
-			Fit.Dom.Text(selection.TextNode, titleWithoutHtml);
-			selection.Title = titleWithoutHtml;
+			Fit.Dom.Replace(selection.TitleNode, newTitleNode);
+			selection.Title = newTitle;
+			selection.TitleNode = newTitleNode;
 
-			fireOnChange();
+			if (orgTitle !== newTitle)
+			{
+				fireOnChange();
+			}
 		}
 	}
 
@@ -18788,7 +18819,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 			if (pickerItem !== null)
 			{
-				updateSelectionElementTitleByValue(selected.Value, Fit.String.StripHtml(pickerItem.Title));
+				me.RenameSelection(selected.Value, pickerItem.Title);
 
 				Fit.Array.Add(updated, { Title: pickerItem.Title, Value: selected.Value, Exists: true });
 			}
@@ -19536,15 +19567,15 @@ Fit.Controls.DropDown = function(ctlId)
 		return txt;
 	}
 
-	function createItemObject(title, value, valid, domElement, textNode)
+	function createItemObject(title, value, valid, domElement, titleNode)
 	{
-		Fit.Validation.ExpectString(title); // NOTICE: Title with any HTML stripped away!
+		Fit.Validation.ExpectString(title);
 		Fit.Validation.ExpectString(value);
 		Fit.Validation.ExpectBoolean(valid);
 		Fit.Validation.ExpectDomElement(domElement);
-		Fit.Validation.ExpectTextNode(textNode);
+		Fit.Validation.ExpectNode(titleNode); // TextNode if HtmlAllowed() is false, DOMElement if HtmlAllowed() is true
 
-		return { Title: title, Value: value, Valid: valid, DomElement: domElement, TextNode: textNode };
+		return { Title: title, Value: value, Valid: valid, DomElement: domElement, TitleNode: titleNode };
 	}
 	/*function convertItemElementToItemObject(itemElm)
 	{
@@ -19552,20 +19583,6 @@ Fit.Controls.DropDown = function(ctlId)
 		return { Title: Fit.Dom.Text(itemElm), Value: decode(Fit.Dom.Data(itemElm, "value")), Valid: Fit.Dom.HasClass(itemElm, "FitUiControlDropDownInvalid") === false, DomElement: itemElm };
 	}*/
 
-	function updateSelectionElementTitleByValue(value, newTitle)
-	{
-		Fit.Validation.ExpectString(value);
-		Fit.Validation.ExpectString(newTitle); // NOTICE: Title with any HTML stripped away!
-
-		var item = itemCollection[value] || null;
-
-		if (item !== null)
-		{
-			item.Title = newTitle;
-			item.DomElement.childNodes[0].nodeValue = newTitle;
-		}
-	}
-
 	/*function getFirstSelectionElement()
 	{
 		if (itemCollectionOrdered.length > 0)
@@ -20205,7 +20222,7 @@ Fit.Controls.DropDown = function(ctlId)
 
 			Fit.Array.ForEach(selections, function(selection)
 			{
-				text += (text !== "" ? ", " : "") + selection.Title;
+				text += (text !== "" ? ", " : "") + Fit.String.StripHtml(selection.Title); // Selected items might contain HTML if HtmlAllowed() is true
 			});
 
 			if (me.MultiSelectionMode() === true && selections.length > 0)
@@ -20925,6 +20942,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 	var useActionMenuForced = false;
 	var useActionMenuAfterLoad = true;
 	var useActionMenuSortingLocale = null;
+	var useActionMenuHtmlAllowed = false;
 	var treeViewEnabled = true;
 	var orgPlaceholder = this.Placeholder;
 	var customPlaceholderSet = false;
@@ -21171,6 +21189,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 		var skipUpdateActionMenuOnChange = false;
 
 		actionMenu = new Fit.Controls.ListView(me.GetId() + "__ActionsListView");
+		actionMenu.HtmlAllowed(true);
 		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")
@@ -21596,6 +21615,21 @@ Fit.Controls.WSDropDown = function(ctlId)
 		return base(val);
 	});
 
+	this.HtmlAllowed = Fit.Core.CreateOverride(this.HtmlAllowed, function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true)
+		{
+			tree.HtmlAllowed(val);
+			list.HtmlAllowed(val);
+			me.ActionMenuHtmlAllowed(val);
+			base(val);
+		}
+
+		return base();
+	});
+
 	this.InputEnabled = Fit.Core.CreateOverride(this.InputEnabled, function(val)
 	{
 		Fit.Validation.ExpectBoolean(val, true);
@@ -21801,6 +21835,23 @@ Fit.Controls.WSDropDown = function(ctlId)
 		return useActionMenuSortingLocale;
 	}
 
+	/// <function container="Fit.Controls.WSDropDown" name="ActionMenuHtmlAllowed" access="public" returns="boolean">
+	/// 	<description> Get/set value indicating whether HTML is allowed (shown) in selected items in action menu </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for HTML, False disables it </param>
+	/// </function>
+	this.ActionMenuHtmlAllowed = function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true && val !== useActionMenuHtmlAllowed)
+		{
+			useActionMenuHtmlAllowed = val;
+			updateActionMenu();
+		}
+
+		return useActionMenuHtmlAllowed;
+	}
+
 	/// <function container="Fit.Controls.WSDropDown" name="ResetActionMenu" access="public">
 	/// 	<description>
 	/// 		Reset action menu so it automatically determines whether to show up or not
@@ -21841,7 +21892,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 
 		Fit.Internationalization.RemoveOnLocaleChanged(localize);
 
-		me = list = tree = actionMenu = search = forceNewSearch = hideLinesForFlatData = dataRequested = dataLoading /*= nodesPopulated*/ = requestCount = onDataLoadedCallback = suppressTreeOnOpen = timeOut = currentRequest = classes = autoUpdatedSelections = useActionMenu = useActionMenuForced = useActionMenuAfterLoad = treeViewEnabled = orgPlaceholder = customPlaceholderSet = translations = onRequestHandlers = onResponseHandlers = null;
+		me = list = tree = actionMenu = search = forceNewSearch = hideLinesForFlatData = dataRequested = dataLoading /*= nodesPopulated*/ = requestCount = onDataLoadedCallback = suppressTreeOnOpen = timeOut = currentRequest = classes = autoUpdatedSelections = useActionMenu = useActionMenuForced = useActionMenuAfterLoad = useActionMenuSortingLocale = useActionMenuHtmlAllowed = treeViewEnabled = orgPlaceholder = customPlaceholderSet = translations = onRequestHandlers = onResponseHandlers = null;
 
 		base();
 	});
@@ -22174,7 +22225,7 @@ Fit.Controls.WSDropDown = function(ctlId)
 
 		Fit.Array.ForEach(selectedItems, function(item)
 		{
-			actionMenu.AddItem((addRemoveAll === true ? " &nbsp; &nbsp; &nbsp; " : "") + delIcon + translations.Remove + " " + item.Title, "Remove:" + item.Value);
+			actionMenu.AddItem((addRemoveAll === true ? " &nbsp; &nbsp; &nbsp; " : "") + delIcon + translations.Remove + " " + (useActionMenuHtmlAllowed === false ? Fit.String.StripHtml(item.Title) : item.Title), "Remove:" + item.Value); // HTML might be allowed in DropDown control but not in ActionMenu, so we strip it away to avoid HTML code in selections
 		});
 	}
 
@@ -23751,7 +23802,7 @@ Fit.Controls.Input = function(ctlId)
 			//return designEditorDetached.GetFocused();
 		}
 
-		elm = input;
+		var elm = input;
 
 		if (me.DesignMode() === true)
 		{
@@ -27807,6 +27858,7 @@ Fit.Controls.ListView = function(controlId)
 	var scrollPositionTop = 0;
 	var highlightFirst = false;
 	var firstWasHighlighted = false;
+	var htmlAllowed = false;
 	var isIe8 = (Fit.Browser.GetInfo().Name === "MSIE" && Fit.Browser.GetInfo().Version === 8);
 
 	var onSelectHandlers = [];
@@ -27953,6 +28005,36 @@ Fit.Controls.ListView = function(controlId)
 	// Public
 	// ============================================
 
+	/// <function container="Fit.Controls.ListView" name="HtmlAllowed" access="public" returns="boolean">
+	/// 	<description> Get/set value indicating whether HTML is allowed (shown) in ListView items </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for HTML, False disables it </param>
+	/// </function>
+	this.HtmlAllowed = function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true && htmlAllowed !== val)
+		{
+			htmlAllowed = val;
+
+			// Update view
+
+			Fit.Array.ForEach(list.children, function(entry)
+			{
+				if (val === false)
+				{
+					Fit.Dom.Text(entry, Fit.String.StripHtml(entry._orgTitle));
+				}
+				else
+				{
+					entry.innerHTML = entry._orgTitle;
+				}
+			});
+		}
+
+		return htmlAllowed;
+	}
+
 	/// <function container="Fit.Controls.ListView" name="AddItem" access="public">
 	/// 	<description> Add item to ListView </description>
 	/// 	<param name="title" type="string"> Item title </param>
@@ -27964,7 +28046,17 @@ Fit.Controls.ListView = function(controlId)
 		Fit.Validation.ExpectString(value);
 
 		var entry = document.createElement("div");
-		entry.innerHTML = title;
+		entry._orgTitle = title;
+
+		if (me.HtmlAllowed() === false)
+		{
+			Fit.Dom.Text(entry, Fit.String.StripHtml(title));
+		}
+		else
+		{
+			entry.innerHTML = title;
+		}
+
 		Fit.Dom.Data(entry, "value", encode(value));
 		Fit.Dom.Data(entry, "active", "false");
 
@@ -28236,7 +28328,7 @@ Fit.Controls.ListView = function(controlId)
 			me.Destroy(true); // PickerBase.Destroy()
 		}
 
-		me = list = active = persistView = scrollPositionTop = highlightFirst = firstWasHighlighted = isIe8 = onSelectHandlers = onSelectedHandlers = null;
+		me = list = active = persistView = scrollPositionTop = highlightFirst = firstWasHighlighted = htmlAllowed = isIe8 = onSelectHandlers = onSelectedHandlers = null;
 	});
 
 	// ============================================
@@ -28281,7 +28373,7 @@ Fit.Controls.ListView = function(controlId)
 	function convertItemElementToObject(elm)
 	{
 		Fit.Validation.ExpectDomElement(elm);
-		return { Title: Fit.Dom.Text(elm), Value: decode(Fit.Dom.Data(elm, "value")) }; // Using Text(..) to get rid of HTML formatting
+		return { Title: elm._orgTitle, Value: decode(Fit.Dom.Data(elm, "value")) };
 	}
 
 	function setActive(elm, suppressScrollIntoView)
@@ -29302,6 +29394,7 @@ Fit.Controls.TreeView = function(ctlId)
 		me._internal.Data("multiselect", "false");
 		me._internal.Data("wordwrap", "false");
 		me._internal.Data("picker", "false");
+		me._internal.Data("htmlallowed", "false");
 
 		// Create internal root node to hold children
 
@@ -29725,6 +29818,31 @@ Fit.Controls.TreeView = function(ctlId)
 		return (me._internal.Data("wordwrap") === "true");
 	}
 
+	/// <function container="Fit.Controls.TreeView" name="HtmlAllowed" access="public" returns="boolean">
+	/// 	<description> Get/set value indicating whether HTML is allowed (shown) in TreeView nodes </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for HTML, False disables it </param>
+	/// </function>
+	this.HtmlAllowed = function(val)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+
+		if (Fit.Validation.IsSet(val) === true)
+		{
+			me._internal.Data("htmlallowed", val.toString());
+
+			// Update view for all nodes recursively
+
+			var nodes = rootNode.GetChildren();
+
+			Fit.Array.ForEach(nodes, function(node)
+			{
+				node.HtmlAllowed(val, true); // Recursive
+			});
+		}
+
+		return (me._internal.Data("htmlallowed") === "true");
+	}
+
 	/// <function container="Fit.Controls.TreeView" name="Selectable" access="public" returns="boolean">
 	/// 	<description>
 	/// 		Get/set value indicating whether user can change selection state of nodes.
@@ -31087,15 +31205,23 @@ Fit.Controls.TreeView = function(ctlId)
 	init();
 }
 
+/// <container name="Fit.Controls.TreeViewNodeOptions">
+/// 	<description> Options for TreeViewNode </description>
+/// 	<member name="HtmlAllowed" type="boolean" default="undefined"> Value indicating whether HTML is allowed (shown) in TreeView node </member>
+/// </container>
+
 /// <function container="Fit.Controls.TreeViewNode" name="TreeViewNode" access="public">
 /// 	<description> Create instance of TreeViewNode </description>
 /// 	<param name="displayTitle" type="string"> Node title </param>
 /// 	<param name="nodeValue" type="string"> Node value </param>
+/// 	<param name="options" type="Fit.Controls.TreeViewNodeOptions" default="undefined"> Optional options </param>
 /// </function>
-Fit.Controls.TreeViewNode = function(displayTitle, nodeValue)
+Fit.Controls.TreeViewNode = function(displayTitle, nodeValue, options)
 {
 	Fit.Validation.ExpectString(displayTitle);
 	Fit.Validation.ExpectString(nodeValue);
+	Fit.Validation.ExpectObject(options, true);
+	Fit.Validation.ExpectBoolean((options || {}).HtmlAllowed, true);
 
 	var me = this;
 	var nodeTitle = null;
@@ -31108,6 +31234,7 @@ Fit.Controls.TreeViewNode = function(displayTitle, nodeValue)
 	var childrenArray = [];
 	var lastChild = null;
 	var behavioralNodeCallback = null;
+	var htmlAllowed = options && options.HtmlAllowed === true || false;
 
 	// ============================================
 	// Init
@@ -31139,6 +31266,36 @@ Fit.Controls.TreeViewNode = function(displayTitle, nodeValue)
 	// Public
 	// ============================================
 
+	/// <function container="Fit.Controls.TreeViewNode" name="HtmlAllowed" access="public" returns="boolean">
+	/// 	<description> Get/set value indicating whether HTML is allowed (shown) in TreeView node </description>
+	/// 	<param name="val" type="boolean" default="undefined"> If defined, True enables support for HTML, False disables it </param>
+	/// 	<param name="recursive" type="boolean" default="undefined"> If defined, True applies change recursively to children </param>
+	/// </function>
+	this.HtmlAllowed = function(val, recursive)
+	{
+		Fit.Validation.ExpectBoolean(val, true);
+		Fit.Validation.ExpectBoolean(recursive, true);
+
+		if (Fit.Validation.IsSet(val) === true)
+		{
+			htmlAllowed = val;
+
+			// Update view - optionally update children recursively
+
+			me.Title(me.Title());
+
+			if (recursive === true)
+			{
+				Fit.Array.ForEach(childrenArray, function(child)
+				{
+					child.HtmlAllowed(val, true);
+				});
+			}
+		}
+
+		return htmlAllowed;
+	}
+
 	/// <function container="Fit.Controls.TreeViewNode" name="Title" access="public" returns="string">
 	/// 	<description> Get/set node title </description>
 	/// 	<param name="val" type="string" default="undefined"> If defined, node title is updated </param>
@@ -31149,11 +31306,19 @@ Fit.Controls.TreeViewNode = function(displayTitle, nodeValue)
 
 		if (Fit.Validation.IsSet(val) === true)
 		{
-			lblTitle.innerHTML = val;
-			nodeTitle = Fit.Dom.Text(lblTitle); // Get rid of HTML formatting for return value
+			nodeTitle = val;
 
-			// Make sure any contained links do not receive focus when navigating TreeView with Tab/Shift+Tab
-			Fit.Array.ForEach(lblTitle.getElementsByTagName("a"), function(link) { link.tabIndex = -1; });
+			if (htmlAllowed === false)
+			{
+				Fit.Dom.Text(lblTitle, Fit.String.StripHtml(val));
+			}
+			else
+			{
+				lblTitle.innerHTML = val;
+
+				// Make sure any contained links do not receive focus when navigating TreeView with Tab/Shift+Tab
+				Fit.Array.ForEach(lblTitle.getElementsByTagName("a"), function(link) { link.tabIndex = -1; });
+			}
 		}
 
 		return nodeTitle;
@@ -31749,7 +31914,7 @@ Fit.Controls.TreeViewNode = function(displayTitle, nodeValue)
 		}
 
 		// Dispose private members
-		me = nodeTitle = elmLi = elmUl = cmdToggle = chkSelect = lblTitle = childrenIndexed = childrenArray = lastChild = behavioralNodeCallback = null;
+		me = nodeTitle = elmLi = elmUl = cmdToggle = chkSelect = lblTitle = childrenIndexed = childrenArray = lastChild = behavioralNodeCallback = htmlAllowed = null;
 	}
 
 	/// <function container="Fit.Controls.TreeViewNode" name="GetDomElement" access="public" returns="DOMElement">
@@ -33316,7 +33481,7 @@ Fit.Controls.WSTreeView = function(ctlId)
 
 		// Convert JSON to TreeView node, including all contained children
 
-		var child = new Fit.Controls.TreeViewNode((jsonNode.Title ? jsonNode.Title : jsonNode.Value), jsonNode.Value);
+		var child = new Fit.Controls.TreeViewNode((jsonNode.Title ? jsonNode.Title : jsonNode.Value), jsonNode.Value, { HtmlAllowed: me.HtmlAllowed() });
 
 		if (jsonNode.Selectable !== undefined)
 			child.Selectable((jsonNode.Selectable === true)); // Node will obtain Selectable state from TreeView unless explicitly set here