aboutsummaryrefslogtreecommitdiff
path: root/node_modules
diff options
context:
space:
mode:
authorArmen Kesablyan2012-06-01 13:28:23 -0700
committerArmen Kesablyan2012-06-01 13:28:23 -0700
commit012b2af27a399fd12b58d5be86bd9509c422010d (patch)
tree5961497b7c5a76ec99b7a98f6731d2cc39a1892e /node_modules
parent77677e5ffb08a5dec4bf0be279130d7b1a99d03f (diff)
parent0f5bdc50d6167b23b694e52e735988f670e85b8b (diff)
downloadninja-012b2af27a399fd12b58d5be86bd9509c422010d.tar.gz
Merge pull request #6 from ericguzman/binding
Binding Panel - Binding Item component CSS change and montage fix
Diffstat (limited to 'node_modules')
-rwxr-xr-xnode_modules/montage/core/serializer.js4
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