Merge pull request #6 from ericguzman/binding

Binding Panel - Binding Item component CSS change and montage fix

2 files changed, 8 insertions, 5 deletions

diff --git a/js/panels/binding/binding-item.reel/binding-item.css b/js/panels/binding/binding-item.reel/binding-item.css
index 0f4416b9..eb4ecfe0 100644
--- a/js/panels/binding/binding-item.reel/binding-item.css
+++ b/js/panels/binding/binding-item.reel/binding-item.css
@@ -10,11 +10,12 @@
     padding: 3px;
     border-bottom: 1px solid #505050;
     list-style-type: none;
-    display: -webkit-box;
-    -webkit-box-orient: horizontal;
+    /*display: -webkit-box;*/
+    /*-webkit-box-orient: horizontal;*/
 }
 .binding-item > * {
-    -webkit-box-flex: 1;
+    /*-webkit-box-flex: 1;*/
+    display: inline-block;
 }
 .source-object, .bound-object {
     padding: 5px 0 3px;
@@ -24,9 +25,11 @@
     background-position: right center;
     background-repeat: no-repeat;
     padding-right: 30px;
+    width: 41%;
 }
 .bound-object {
     padding-left: 12px;
+    width: 41%;
 }
 .so-object-identifier, .bo-object-identifier {
     float: right;
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
                     return this._serializeElement(value);
                 } else if (Array.isArray(value)) {
                     return this._serializeArray(value, indent + 1);
-                } else if (Object.getPrototypeOf(value) === Object.prototype) {
-                    return this._serializeObjectLiteral(value, null, indent + 1);
                 } else if (value.constructor === Function) {
                     return this._serializeFunction(value, indent);
+                } else if (!("getInfoForObject" in value)) { // we consider object literals the ones who aren't a Montage object
+                    return this._serializeObjectLiteral(value, null, indent + 1);
                 } else {
                     // TODO: should refactor this to handle references here, doesn't make
                     //       sense to wait until it hits _serializeObject for that to happen