10 files changed, 76 insertions, 27 deletions
diff --git a/js/components/radio.reel/radio.html b/js/components/radio.reel/radio.html
index 01b76b92..cee4c369 100755
--- a/js/components/radio.reel/radio.html
+++ b/js/components/radio.reel/radio.html
@@ -11,13 +11,18 @@
        "owner": {
            "prototype": "js/components/radio.reel",
            "properties": {
-                "element": {"#": "ch_comp"}
+                "element": {"#": "radio_comp"},
+                "labelField": {"#": "labelField"},
+                "radioField": {"#": "radioField"}
            }
        }
    }
    </script>
 </head>
 <body>
-    <input data-montage-id="ch_comp" class="nj-skinned" type="radio">
+    <div data-montage-id="radio_comp">
+        <input data-montage-id="radioField" class="nj-skinned" type="radio">
+        <label data-montage-id="labelField" class="nj-skinned"></label>
+    </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/radio.reel/radio.js b/js/components/radio.reel/radio.js
index c661ec11..cec4f52e 100755
--- a/js/components/radio.reel/radio.js
+++ b/js/components/radio.reel/radio.js
@@ -62,7 +62,7 @@ exports.RadioGroup = Montage.create(Component, {
    {
        value:function(radio)
        {
-            radio.element.setAttribute("name", this.name);
+            radio.radioField.setAttribute("name", this.name);
            radio.addEventListener("change", this, false);
            this.radios.push(radio);
        }
@@ -104,6 +104,14 @@ exports.Radio = Montage.create(Component, {
        value: null
    },
+    labelField: {
+        value: null
+    },
+    radioField: {
+        value: null
+    },
    _checked: {
        enumerable: false,
        value: false
@@ -140,13 +148,13 @@ exports.Radio = Montage.create(Component, {
                {
            this._valueSyncedWithInputField = true;
            this._wasSetByCode = false;
-            this.checked = this.element.checked;
+            this.checked = this.radioField.checked;
                }
    },
    handleClick: {
        value: function() {
            this._wasSetByCode = false;
-            this.checked = !this.element.checked;
+            this.checked = !this.radioField.checked;
        }
    },
    
@@ -154,7 +162,7 @@ exports.Radio = Montage.create(Component, {
        value: function() {
            if(!this._valueSyncedWithInputField)
            {
-                this.element.checked = this._checked;
+                this.radioField.checked = this._checked;
            }
            this._valueSyncedWithInputField = false;
        }
@@ -163,15 +171,13 @@ exports.Radio = Montage.create(Component, {
    prepareForDraw: {
        value: function() {
            if (this.label !== null) {
-                var b = document.createElement("label");
+                this.labelField.innerHTML = this.label;
-                b.innerHTML = this.label;
-                this.element.appendChild(b);
-                b.addEventListener("click", this, false);
            }
+            this.element.addEventListener("click", this, false);
            if (this.group !== null) {
                this.group.addRadio(this);
            }
-            this.element.addEventListener("change", this, false);
+            this.radioField.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;
+                if(data) {
-                this.controlType = data.controlType;
+                    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);
                }
        },
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.html b/js/panels/Materials/materials-popup.reel/materials-popup.html
index d18599d6..bac722cd 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.html
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.html
@@ -43,7 +43,7 @@
                    "data": {
                        "boundObject": {"@": "materialsProperties"},
                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": false
+                        "oneway": true
                    }
                },
                "listeners": [
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index bd10f7a5..a4f758cf 100755
--- a/js/panels/Materials/materials-popup.reel/materials-popup.js
+++ b/js/panels/Materials/materials-popup.reel/materials-popup.js
@@ -625,6 +625,11 @@ exports.MaterialsPopup = Montage.create(Component, {
                    }
                ]
    },
+    materialsProperties: {
+        serializable: true,
+        value: null
+    },
    
    _materialsData: {
                enumerable: true,
@@ -641,7 +646,7 @@ exports.MaterialsPopup = Montage.create(Component, {
            },
        set: function(data) {
            this._materialsData = data;
-            if(this.materialsProperties)
+            if(this.materialsProperties && data.length)
            {
                this.materialsProperties.needsDraw = true;