10 files changed, 62 insertions, 51 deletions
diff --git a/js/panels/properties.reel/properties.css b/js/panels/properties.reel/properties.css
index 0928da3a..eee44561 100755
--- a/js/panels/properties.reel/properties.css
+++ b/js/panels/properties.reel/properties.css
@@ -4,6 +4,21 @@
 (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
 </copyright> */
+/* Cleanup TODO - now that we removed the color toolbar from the tools panel, we no longer load the colortoolbar reel.
+                  Currently the color chips in the property inspector rely on the colortoolbar button style so we
+                  copied the class here. When we do the color feature cleanup we should remove this dependency.
+*/
+.colortoolbar button {
+  float: left;
+  clear: both;
+  width: 27px;
+  height: 27px;
+  background: black;
+  border: 1px solid #000;
+  padding: 0;
+  margin: 0px;
+}
 .propertiesPanel {
    color:#FFF;
    overflow-x: hidden;
diff --git a/js/panels/properties.reel/properties.html b/js/panels/properties.reel/properties.html
index 554d1477..3a1ae880 100755
--- a/js/panels/properties.reel/properties.html
+++ b/js/panels/properties.reel/properties.html
@@ -105,26 +105,26 @@
                </script>
 </head>
 <body>
-    <section id="propertiesPanel" class="propertiesPanel">
+    <section data-montage-id="propertiesPanel" class="propertiesPanel">
        <section class="sectional">
            <section class="fieldCol">
                <label>Element:</label>
-                <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article>
+                <article class="fieldRow"><input type="text" data-montage-id="elementName" class="nj-skinned" readonly="readonly"></article>
            </section>
            <section class="fieldCol">
                <label>ID:</label>
-                <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article>
+                <article class="fieldRow"><input type="text" data-montage-id="elementId" class="nj-skinned" /></article>
            </section>
            <section class="fieldCol">
                <label>Class:</label>
-                <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article>
+                <article class="fieldRow"><input type="text" data-montage-id="elementClass" class="nj-skinned" /></article>
            </section>
        </section>
-        <section id="PosSize"></section>
+        <section data-montage-id="PosSize"></section>
-        <section id="customSections">
+        <section data-montage-id="customSections">
-            <div id="customSection"></div>
+            <div data-montage-id="customSection"></div>
        </section>
-        <section id="threeD"></section>
+        <section data-montage-id="threeD"></section>
    </section>
 </body>
 </html>
 \ No newline at end of file
diff --git a/js/panels/properties.reel/properties.js b/js/panels/properties.reel/properties.js
index ee90cd64..8c2daa14 100755
--- a/js/panels/properties.reel/properties.js
+++ b/js/panels/properties.reel/properties.js
@@ -208,11 +208,7 @@ exports.Properties = Montage.create(Component, {
                this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle");
            }
-            if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") {
+            this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d";
-                this.threeD.flatten = false;
-            } else {
-                this.threeD.flatten = true;
-            }
            if(this.customPi !== stage.elementModel.pi) {
                // We need to unregister color chips from the previous selection from the Color Model
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index e6f68751..c9b14565 100755
--- a/js/panels/properties.reel/section.reel/section.html
+++ b/js/panels/properties.reel/section.reel/section.html
@@ -36,12 +36,12 @@
    </script>
 </head>
 <body>
-    <div id="section">
+    <div data-montage-id="section">
-        <h2 id="sectionSplitter" class="subSectionHeader">
+        <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
            <section class="arrow"><div class="arrowIcon animated"></div></section>
            <section class="title"></section>
        </h2>
-        <div id="sectionSlot" class="animated"></div>
+        <div data-montage-id="sectionSlot" class="animated"></div>
    </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
index 990dc739..cef44f31 100755
--- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
+++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html
@@ -38,11 +38,11 @@
    </script>
 </head>
 <body>
-    <div id="section">
+    <div data-montage-id="section">
        <section class="fieldCol">
            <article class="fieldRow colorSelect">
-                <div id="Stroke"></div>
+                <div data-montage-id="Stroke"></div>
-                <div id="Fill"></div>
+                <div data-montage-id="Fill"></div>
            </article>
        </section>
    </div>
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
index d1b5f28b..bdcbff7f 100755
--- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html
@@ -44,17 +44,17 @@
    </script>
 </head>
 <body>
-    <div id="section">
+    <div data-montage-id="section">
        <section class="fieldCol">
            <label class="lbl"></label>
            <article class="fieldRow">
-                <div id="slotElement" class="inputField">
+                <div data-montage-id="slotElement" class="inputField">
                    
                </div>
            </article>
            <label class="lbl"></label>
            <article class="fieldRow">
-                <div id="slotElement2" class="inputField">
+                <div data-montage-id="slotElement2" class="inputField">
                </div>
            </article>
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
index b606e5db..88f12186 100755
--- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
+++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html
@@ -31,11 +31,11 @@
    </script>
 </head>
 <body>
-    <div id="section">
+    <div data-montage-id="section">
        <section class="fieldCol">
            <label><span class="lbl"></span></label>
            <article class="fieldRow">
-                <div id="slotElement" class="inputField">
+                <div data-montage-id="slotElement" class="inputField">
                    
                </div>
            </article>
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html
index cc48d2e7..cfc5208c 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.html
+++ b/js/panels/properties.reel/sections/custom.reel/custom.html
@@ -49,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
    </script>
 </head>
 <body>
-    <div id="section" class="sectional">
+    <div data-montage-id="section" class="sectional">
-        <div id="repetitionContainer">