Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

[[ Navbar ]] Use defaults when navbar data is set with missing elements #2433

Merged
livecodeali merged 1 commit into from
Jun 19, 2015
Merged

[[ Navbar ]] Use defaults when navbar data is set with missing elements #2433

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion extensions/widgets/navbar/navbar.lcb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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
Expand Down