Merge pull request livecode#2433 from livecodeali/feature-navbar_forgiveness

livecodeali · livecodeali · commit 425fcc8033fd · 2015-06-19T09:40:47.000+01:00
[[ Navbar ]] Use defaults when navbar data is set with missing elements
diff --git a/extensions/widgets/navbar/navbar.lcb b/extensions/widgets/navbar/navbar.lcb
@@ -942,7 +942,12 @@ private handler setData(in pArray as Array, in pKeys as List, out rList as List)
 		put the empty array into tElement
 		repeat for each element tKey in pKeys
 			put tLookup[tOrderKey formatted as string] into tOriginalKey
-			put pArray[tOriginalKey][tKey] into tElement[tKey]
+			-- Use default item if key is not present
+			if tKey is among the keys of pArray[tOriginalKey] then
+				put pArray[tOriginalKey][tKey] into tElement[tKey]
+			else
+				put defaultNavElement(tKey) into tElement[tKey]
+			end if
 		end repeat
 		if tElement["label"] is "" then
 			put "New Item" into tElement["label"]
@@ -1040,6 +1045,23 @@ end handler
 --
 --------------------------------------------------------------------------------
 
+private handler defaultNavElement(in pKey as String) returns String
+	if pKey is "name" then
+		return kDefaultNavName
+	else if pKey is "label" then
+		return kDefaultNavLabel
+	else if pKey is "icon_name" then
+		return kDefaultNavIconName
+	else if pKey is "selected_icon_name" then
+		return ""
+	else if pKey is "icon" then
+		return ""
+	else if pKey is "selected_icon" then
+		return ""
+	end if
+	return ""
+end handler
+
 private handler defaultNavArray() returns Array
 	variable tArray as Array
 	put the empty array into tArray
