10 files changed, 54 insertions, 40 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index ad0236c6..50b3624c 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -121,8 +121,8 @@ exports.DocumentEntry = Montage.create(Component, {
             if(event._event.target.nodeName === "IMG") {
                 this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
             } else {
-                if(!this._document.isActive) {
-                    this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
+                if(!this.active) {
+                    this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
                 }
             }
         }
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 84a6d34e..a329f646 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -16,6 +16,10 @@
                 "prototype": "js/components/layout/tool-button.reel",
                 "properties": {
                     "element": {"#": "toolBarButton"}
+                },
+                "bindings": {
+                    "selected": {"<<->": "@owner.data.selected"},
+                    "subselected": {"<-": "@owner.data.subtools.selected"}
                 }
             }
         }
diff --git a/js/components/layout/tool-button.reel/tool-button.js b/js/components/layout/tool-button.reel/tool-button.js
index 6cea0dc3..6008c4ec 100755
--- a/js/components/layout/tool-button.reel/tool-button.js
+++ b/js/components/layout/tool-button.reel/tool-button.js
@@ -48,19 +48,8 @@ exports.ToolButton = Montage.create(Component, {
             this.element.addEventListener("mousedown", this, false);
             this.element.addEventListener("dblclick", this, false);
 
-            Object.defineBinding(this, "selected", {
-              boundObject: this.data,
-              boundObjectPropertyPath: "selected",
-              oneway: false
-            });
-
             if(this.data.container) {
                 this.element.title = this.data.subtools[this._subselected].toolTip;
-                Object.defineBinding(this, "subselected", {
-                    boundObject: this.data.subtools,
-                    boundObjectPropertyPath: "selected",
-                    oneway: true
-                });
             }
 
             this.element.classList.add(this.data.id)
diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index d5c33624..df603bf8 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -16,11 +16,7 @@
                     "element": {"#": "toolbutton"}
                 },
                 "bindings": {
-                    "data": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    }
+                    "data": {"<-": "@repetition1.objectAtCurrentIteration"}
                 }
             },
 
@@ -30,11 +26,7 @@
                     "element": {"#": "groupLine"}
                 },
                 "bindings": {
-                    "condition": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.lastInGroup",
-                        "oneway": true
-                    }
+                    "condition": {"<-": "@repetition1.objectAtCurrentIteration.lastInGroup"}
                 }
             },
 
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");
-                b.innerHTML = this.label;
-                this.element.appendChild(b);
-                b.addEventListener("click", this, false);
+                this.labelField.innerHTML = this.label;
             }
+            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/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'}
     },