Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates

4 files changed, 24 insertions, 6 deletions

diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index 4e64b2e8..630dcd4b 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -33,6 +33,11 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
         value: {r:0, g:0, b:0, a:1, css:'rgb(0,0,0)', mode:'rgb'}
     },
 
+    chipBtn: {
+        serializable: true,
+        value: null
+    },
+
     changeDelegate: {
         value: function(event) {
             this.color = event._event.color;
@@ -60,7 +65,7 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
                 this.icon.style.display = "none";
             }
 
-            this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, offset: this.offset};
+            this.chipBtn.props = {side: 'right', align: 'top', wheel: true, palette: true, gradient: true, image: true, nocolor: true, offset: this.offset};
             this.application.ninja.colorController.addButton(this.mode, this.chipBtn);
 
         }
@@ -80,9 +85,13 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
                     b = colorObj.value.b;
                     a = colorObj.value.a;
                     css = colorObj.css;
+                    this.chipBtn.color(mode, {wasSetByCode: true, type: 'change', color: {r: r, g: g, b: b}, css: css});
+                } else {
+                    mode = "nocolor";
+                    this.chipBtn.color(mode, null);
+
                 }
 
-                this.chipBtn.color(mode, {wasSetByCode: true, type: 'change', color: {r: r, g: g, b: b}, css: css});
                 this.chipBtn.addEventListener("change", this, false);
             }
         }
diff --git a/js/components/ui/file-input.reel/file-input.js b/js/components/ui/file-input.reel/file-input.js
index b57f7c21..584380ec 100755
--- a/js/components/ui/file-input.reel/file-input.js
+++ b/js/components/ui/file-input.reel/file-input.js
@@ -38,7 +38,7 @@ var FileInput = exports.FileInput = Montage.create(Component, {
     {
         value:function(event)
                 {
-            if(event.currentTarget.id === "fileInputControl")
+            if(event.currentTarget.type === "file")
             {
                 this.filePath = this.inputField.value;
             }
diff --git a/js/components/ui/input-group.reel/input-group.html b/js/components/ui/input-group.reel/input-group.html
index ba85c089..7da4a855 100755
--- a/js/components/ui/input-group.reel/input-group.html
+++ b/js/components/ui/input-group.reel/input-group.html
@@ -25,7 +25,8 @@
             "bindings": {
                 "data": {
                     "boundObject": {"@": "propList"},
-                    "boundObjectPropertyPath": "objectAtCurrentIteration"
+                    "boundObjectPropertyPath": "objectAtCurrentIteration",
+                    "oneway": true
                 }
             },
             "listeners": [
diff --git a/js/components/ui/property-control.reel/property-control.js b/js/components/ui/property-control.reel/property-control.js
index c28979a9..20ec173e 100755
--- a/js/components/ui/property-control.reel/property-control.js
+++ b/js/components/ui/property-control.reel/property-control.js
@@ -120,8 +120,13 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
         set: function (data) {
             if (data !== this._data) {
                 this._data = data;
-                this.label = data.label;
-                this.controlType = data.controlType;
+                if(data) {
+                    this._label = data.label;
+                    this._controlType = data.controlType;
+                } else {
+                    this._label = "";
+                    this._controlType = null;
+                }
                 this.needsDraw = true;
             }
         }
@@ -143,6 +148,9 @@ var PropertyControl = exports.PropertyControl = Montage.create(Component, {
         {
                 value:function(event)
                 {
+            if(event.wasSetByCode) {
+                return;
+            }
             this._dispatchPropEvent(event);
                 }
         },