diff options
author | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-06-20 15:04:45 -0700 |
commit | c6ae80c488621d4ac189cb63309b6258115f823a (patch) | |
tree | dfa26112e1830972fcb212bbb5b17c9a901c645f /node_modules/montage/core/serializer.js | |
parent | 022e714cb5d10cd8575ab9907eddfb184a990b66 (diff) | |
parent | c9852665eadc1acb9c1c881d207c4bd9ef88805f (diff) | |
download | ninja-c6ae80c488621d4ac189cb63309b6258115f823a.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into Timeline-merge-candidate
Diffstat (limited to 'node_modules/montage/core/serializer.js')
-rwxr-xr-x | node_modules/montage/core/serializer.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/core/serializer.js b/node_modules/montage/core/serializer.js index 72543328..deadbc68 100755 --- a/node_modules/montage/core/serializer.js +++ b/node_modules/montage/core/serializer.js | |||
@@ -529,10 +529,10 @@ var Serializer = Montage.create(Montage, /** @lends module:montage/serializer.Se | |||
529 | return this._serializeElement(value); | 529 | return this._serializeElement(value); |
530 | } else if (Array.isArray(value)) { | 530 | } else if (Array.isArray(value)) { |
531 | return this._serializeArray(value, indent + 1); | 531 | return this._serializeArray(value, indent + 1); |
532 | } else if (Object.getPrototypeOf(value) === Object.prototype) { | ||
533 | return this._serializeObjectLiteral(value, null, indent + 1); | ||
534 | } else if (value.constructor === Function) { | 532 | } else if (value.constructor === Function) { |
535 | return this._serializeFunction(value, indent); | 533 | return this._serializeFunction(value, indent); |
534 | } else if (!("getInfoForObject" in value)) { // we consider object literals the ones who aren't a Montage object | ||
535 | return this._serializeObjectLiteral(value, null, indent + 1); | ||
536 | } else { | 536 | } else { |
537 | // TODO: should refactor this to handle references here, doesn't make | 537 | // TODO: should refactor this to handle references here, doesn't make |
538 | // sense to wait until it hits _serializeObject for that to happen | 538 | // sense to wait until it hits _serializeObject for that to happen |