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

Commit 80c2964

Browse files
Merge pull request #1918 from livecode/bugfix-20888
[[ Bug 20888]] Tree view doesn't allow comma in keys
2 parents f127627 + 4b6c8e0 commit 80c2964

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

Toolset/palettes/inspector/editors/com.livecode.pi.array.behavior.livecodescript

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ on editorUpdate
1717
local tPath
1818
put the hilitedElement of widget 1 of me into tPath
1919
set the arrayData of widget 1 of me to tValue
20+
set the pathDelimiter of widget 1 of me to numToCodepoint(0)
2021
unlock messages
2122
updateEditorFields tPath
2223
lock messages
@@ -38,6 +39,7 @@ end editorUpdate
3839

3940
on updateEditorFields pPath
4041
local tValue
42+
set the itemdelimiter to the pathDelimiter of widget 1 of me
4143
put the editorValue of me into tValue
4244
if pPath is empty then
4345
put empty into field "key" of me
@@ -99,6 +101,7 @@ end setValue
99101

100102
on setArrayDataOnPath pValue, pPath, @xArray
101103
local tKey
104+
set the itemdelimiter to the pathDelimiter of widget 1 of me
102105
put item 1 of pPath into tKey
103106
if the number of items in pPath is 1 then
104107
put pValue into xArray[tKey]
@@ -110,6 +113,7 @@ end setArrayDataOnPath
110113

111114
on setArrayKeyOnPath pKey, pPath, @xArray
112115
local tKey
116+
set the itemdelimiter to the pathDelimiter of widget 1 of me
113117
put item 1 of pPath into tKey
114118
if the number of items in pPath is 1 then
115119
local tSubArray
@@ -124,6 +128,7 @@ end setArrayKeyOnPath
124128

125129
on deleteArrayKeyOnPath pPath, @xArray
126130
local tKey
131+
set the itemdelimiter to the pathDelimiter of widget 1 of me
127132
put item 1 of pPath into tKey
128133
if the number of items in pPath is 1 then
129134
delete variable xArray[item 1 of pPath]
@@ -135,6 +140,7 @@ end deleteArrayKeyOnPath
135140

136141
on addArrayKeyOnPath pPath, @xArray
137142
local tKey
143+
set the itemdelimiter to the pathDelimiter of widget 1 of me
138144
put item 1 of pPath into tKey
139145
if the number of items in pPath is 1 then
140146
put "" into xArray[item 1 of pPath]
@@ -146,6 +152,7 @@ end addArrayKeyOnPath
146152

147153
on fetchArrayDataOnPath pPath, pArray, @rData
148154
local tKey
155+
set the itemdelimiter to the pathDelimiter of widget 1 of me
149156
put item 1 of pPath into tKey
150157
if the number of items in pPath is 1 then
151158
if tKey is not among the keys of pArray then
@@ -166,6 +173,7 @@ end dataChanged
166173

167174
on valueChanged
168175
local tPath
176+
set the itemdelimiter to the pathDelimiter of widget 1 of me
169177
put the hilitedElement of widget 1 of me into tPath
170178
if tPath is empty then
171179
# Don't update anthing
@@ -180,6 +188,7 @@ end valueChanged
180188
on keyChanged
181189
lock screen
182190
local tPath
191+
set the itemdelimiter to the pathDelimiter of widget 1 of me
183192
put the hilitedElement of widget 1 of me into tPath
184193

185194
local tArray, tNewKey
@@ -213,6 +222,7 @@ end hiliteChanged
213222

214223
on updateHIlite
215224
local tPath
225+
set the itemdelimiter to the pathDelimiter of widget 1 of me
216226
put the hilitedElement of widget 1 of me into tPath
217227

218228
# Hilite a newly created key

0 commit comments

Comments
 (0)