aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--js/panels/binding/binding-item.reel/binding-item.css9
-rwxr-xr-xnode_modules/montage/core/serializer.js4
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 @@
10 padding: 3px; 10 padding: 3px;
11 border-bottom: 1px solid #505050; 11 border-bottom: 1px solid #505050;
12 list-style-type: none; 12 list-style-type: none;
13 display: -webkit-box; 13 /*display: -webkit-box;*/
14 -webkit-box-orient: horizontal; 14 /*-webkit-box-orient: horizontal;*/
15} 15}
16.binding-item > * { 16.binding-item > * {
17 -webkit-box-flex: 1; 17 /*-webkit-box-flex: 1;*/
18 display: inline-block;
18} 19}
19.source-object, .bound-object { 20.source-object, .bound-object {
20 padding: 5px 0 3px; 21 padding: 5px 0 3px;
@@ -24,9 +25,11 @@
24 background-position: right center; 25 background-position: right center;
25 background-repeat: no-repeat; 26 background-repeat: no-repeat;
26 padding-right: 30px; 27 padding-right: 30px;
28 width: 41%;
27} 29}
28.bound-object { 30.bound-object {
29 padding-left: 12px; 31 padding-left: 12px;
32 width: 41%;
30} 33}
31.so-object-identifier, .bo-object-identifier { 34.so-object-identifier, .bo-object-identifier {
32 float: right; 35 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
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