Issue #5, handle null in json

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -84,7 +84,9 @@
json = {};
for (name in val) {
o = val[name];
if (o.constructor === {}.constructor) {
if (o === null) {
json[name] = o;
} else if (o.constructor === {}.constructor) {
json[name] = this.val(name).toJson();
} else if (o instanceof types.Operation) {
while (o instanceof types.Operation) {
@@ -131,7 +133,7 @@
this.val(o_name, o, content);
}
return this;
} else if ((name != null) && (content != null)) {
} else if ((name != null) && ((content != null) || content === null)) {
if (mutable != null) {
if (mutable === true || mutable === 'mutable') {
mutable = true;
@@ -143,7 +145,7 @@
}
if (typeof content === 'function') {
return this;
} else if (((!mutable) || typeof content === 'number') && content.constructor !== Object) {
} else if (content === null || (((!mutable) || typeof content === 'number') && content.constructor !== Object)) {
obj = HB.addOperation(new types.ImmutableObject(void 0, content)).execute();
return JsonType.__super__.val.call(this, name, obj);
} else {

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
{"version":3,"sources":["Types/XmlTypes.coffee"],"names":[],"mappings":"AAoGwC;AAAA;AAAA","file":"Types/XmlTypes.js","sourceRoot":"/source/","sourcesContent":[""]}
{"version":3,"sources":["Types/XmlTypes.coffee"],"names":[],"mappings":"AAyGwC;AAAA;AAAA","file":"Types/XmlTypes.js","sourceRoot":"/source/","sourcesContent":[""]}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long