8 files changed, 183 insertions, 119 deletions

diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index f8d37984..f82d3660 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -230,23 +230,10 @@ padding-right:6px;
     clear:none;
 }
 
-.propertiesPanel .LockToolUp, .propertiesPanel .UnLockToolUp {
-    position: absolute;
-    left: 105px;
-    border: none;
-    background-color: transparent;
-    top: 2px;
-    opacity: 0.7;
-}
-
 .propertiesPanel .button:active {
     outline: none;
 }
 
-.propertiesPanel .LockToolUp:hover, .propertiesPanel .UnLockToolUp:hover {
-    opacity: 1;
-}
-
 .propertiesPanel input[type="checkbox"].nj-skinned, .propertiesPanel input[type="radio"].nj-skinned {
     position: relative;
     overflow: visible;
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 72a6def6..d212ae80 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -10,35 +10,19 @@
         <link rel="stylesheet" href="properties.css" type="text/css">
         <script type="text/montage-serialization">
         {
-            "elementNameInput1": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
+            "elementName": {
+                "prototype": "montage/ui/textfield.reel",
                 "properties": {
                     "element": {"#": "elementName"},
                     "readOnly": true
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementName",
-                        "oneway": true
-                    }
                 }
             },
 
-            "elementID": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
+            "elementId": {
+                "prototype": "montage/ui/textfield.reel",
                 "properties": {
-                    "element": {"#": "elementID"},
+                    "element": {"#": "elementId"},
                     "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementID",
-                        "oneway": true
-                    }
                 }
             },
 
@@ -46,35 +30,11 @@
                 "module": "montage/ui/textfield.reel",
                 "name": "Textfield",
                 "properties": {
-                    "element": {"#": "elementClassName"},
+                    "element": {"#": "elementClass"},
                     "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "elementClassName",
-                        "oneway": true
-                    }
-                }
-            },
-
-            "elementNameAttribute": {
-                "module": "montage/ui/textfield.reel",
-                "name": "Textfield",
-                "properties": {
-                    "element": {"#": "elementNameAttribute"},
-                    "readOnly": false
-                },
-                "bindings": {
-                    "value": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "nameAttribute",
-                        "oneway": false
-                    }
                 }
             },
 
-
             "PosSizeSection": {
                 "module": "js/panels/properties.reel/section.reel",
                 "name": "Section",
@@ -142,9 +102,9 @@
                 "name": "Properties",
                 "properties": {
                     "element":              {"#": "propertiesPanel"},
-                    "elementNameInput":     {"@": "elementNameInput1"},
-                    "elementId":            {"@": "elementID"},
-                    "elementNameAttribute": {"@": "elementNameAttribute"},
+                    "elementName":          {"@": "elementName"},
+                    "elementClass":         {"@": "elementClass"},
+                    "elementId":            {"@": "elementId"},
                     "positionSize":         {"@": "PosSize"},
                     "threeD":               {"@": "threeDProperties"}
                 }
@@ -156,20 +116,16 @@
     <section id="propertiesPanel" class="propertiesPanel">
         <section class="sectional">
             <section class="fieldCol">
-                <label id="lblElement">Element:</label>
+                <label>Element:</label>
                 <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article>
             </section>
             <section class="fieldCol">
-                <label id="lblID">ID:</label>
-                <article class="fieldRow"><input type="text" id="elementID" class="nj-skinned" /></article>
-            </section>
-            <section class="fieldCol">
-                <label id="lblClass">Class:</label>
-                <article class="fieldRow"><input type="text" id="elementClassName" class="nj-skinned" /></article>
+                <label>ID:</label>
+                <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article>
             </section>
             <section class="fieldCol">
-                <label id="lblName">Name:</label>
-                <article class="fieldRow"><input type="text" id="elementNameAttribute" class="nj-skinned" /></article>
+                <label>Class:</label>
+                <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article>
             </section>
         </section>
         <section id="PosSize"></section>
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index eb9faa8b..40e9b86a 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -17,15 +17,11 @@ exports.Properties = Montage.create(Component, {
         value: null
     },
 
-    elementID: {
+    elementId: {
         value: null
     },
 
-    elementClassName: {
-        value: null
-    },
-
-    nameAttribute: {
+    elementClass: {
         value: null
     },
 
@@ -60,6 +56,14 @@ exports.Properties = Montage.create(Component, {
 
             this.eventManager.addEventListener("openDocument", this, false);
             this.eventManager.addEventListener("switchDocument", this, false);
+
+            this.elementId.element.addEventListener("blur", this, false);
+            this.elementId.element.addEventListener("focus", this, false);
+            this.elementId.element.addEventListener("keyup", this, false);
+
+            this.elementClass.element.addEventListener("blur", this, false);
+            this.elementClass.element.addEventListener("focus", this, false);
+            this.elementClass.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -73,12 +77,6 @@ exports.Properties = Montage.create(Component, {
             if(this.application.ninja.selectedElements.length === 0) {
                 this.displayStageProperties();