yonote/yjs
14
0
Fork 0
Code Pull Requests 1 Releases Activity

Issue #5, handle null in json

Browse Source
This commit is contained in:
Kevin Jahns
2014-08-26 03:05:43 +02:00
parent f444b25ac9
commit b03f477a3f
34 changed files with 85 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Types/JsonTypes.coffee
View File

@@ -131,7 +131,9 @@ module.exports = (HB)->
val = @val()
json = {}
for name, o of val
if o.constructor is {}.constructor
if o is null
json[name] = o
else if o.constructor is {}.constructor
json[name] = @val(name).toJson()
else if o instanceof types.Operation
while o instanceof types.Operation
@@ -197,7 +199,7 @@ module.exports = (HB)->
for o_name,o of name
@val(o_name,o,content)
@
else if name? and content?
else if name? and (content? or content is null)
if mutable?
if mutable is true or mutable is 'mutable'
mutable = true
@@ -207,7 +209,7 @@ module.exports = (HB)->
mutable = @mutable_default
if typeof content is 'function'
@ # Just do nothing
else if ((not mutable) or typeof content is 'number') and content.constructor isnt Object
else if content is null or (((not mutable) or typeof content is 'number') and content.constructor isnt Object)
obj = HB.addOperation(new types.ImmutableObject undefined, content).execute()
super name, obj
else