aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-22 13:22:26 -0700
committerPushkar Joshi2012-05-22 13:22:26 -0700
commit01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch)
treeceb527713554f506c537168e36a10452cd09ad10 /js/panels/properties.reel
parentb9262c831952e77135b79c2de7c455d5e7ff0589 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/properties.reel')
-rwxr-xr-xjs/panels/properties.reel/properties.css15
-rwxr-xr-xjs/panels/properties.reel/properties.html16
-rwxr-xr-xjs/panels/properties.reel/properties.js6
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html6
-rwxr-xr-xjs/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html4
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html6
-rwxr-xr-xjs/panels/properties.reel/sections/position-and-size.reel/position-and-size.html18
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html30
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 @@
4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 4 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5 </copyright> */ 5 </copyright> */
6 6
7/* Cleanup TODO - now that we removed the color toolbar from the tools panel, we no longer load the colortoolbar reel.
8 Currently the color chips in the property inspector rely on the colortoolbar button style so we
9 copied the class here. When we do the color feature cleanup we should remove this dependency.
10*/
11.colortoolbar button {
12 float: left;
13 clear: both;
14 width: 27px;
15 height: 27px;
16 background: black;
17 border: 1px solid #000;
18 padding: 0;
19 margin: 0px;
20}
21
7.propertiesPanel { 22.propertiesPanel {
8 color:#FFF; 23 color:#FFF;
9 overflow-x: hidden; 24 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 @@
105 </script> 105 </script>
106</head> 106</head>
107<body> 107<body>
108 <section id="propertiesPanel" class="propertiesPanel"> 108 <section data-montage-id="propertiesPanel" class="propertiesPanel">
109 <section class="sectional"> 109 <section class="sectional">
110 <section class="fieldCol"> 110 <section class="fieldCol">
111 <label>Element:</label> 111 <label>Element:</label>
112 <article class="fieldRow"><input type="text" id="elementName" class="nj-skinned" readonly="readonly"></article> 112 <article class="fieldRow"><input type="text" data-montage-id="elementName" class="nj-skinned" readonly="readonly"></article>
113 </section> 113 </section>
114 <section class="fieldCol"> 114 <section class="fieldCol">
115 <label>ID:</label> 115 <label>ID:</label>
116 <article class="fieldRow"><input type="text" id="elementId" class="nj-skinned" /></article> 116 <article class="fieldRow"><input type="text" data-montage-id="elementId" class="nj-skinned" /></article>
117 </section> 117 </section>
118 <section class="fieldCol"> 118 <section class="fieldCol">
119 <label>Class:</label> 119 <label>Class:</label>
120 <article class="fieldRow"><input type="text" id="elementClass" class="nj-skinned" /></article> 120 <article class="fieldRow"><input type="text" data-montage-id="elementClass" class="nj-skinned" /></article>
121 </section> 121 </section>
122 </section> 122 </section>
123 <section id="PosSize"></section> 123 <section data-montage-id="PosSize"></section>
124 <section id="customSections"> 124 <section data-montage-id="customSections">
125 <div id="customSection"></div> 125 <div data-montage-id="customSection"></div>
126 </section> 126 </section>
127 <section id="threeD"></section> 127 <section data-montage-id="threeD"></section>
128 </section> 128 </section>
129</body> 129</body>
130</html> \ No newline at end of file 130</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, {
208 this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle"); 208 this.threeD.zAngle = ElementsMediator.get3DProperty(stage, "zAngle");
209 } 209 }
210 210
211 if(ElementsMediator.getProperty(stage, "-webkit-transform-style") === "preserve-3d") { 211 this.threeD.flatten = ElementsMediator.getProperty(stage, "-webkit-transform-style") !== "preserve-3d";
212 this.threeD.flatten = false;
213 } else {
214 this.threeD.flatten = true;
215 }
216 212
217 if(this.customPi !== stage.elementModel.pi) { 213 if(this.customPi !== stage.elementModel.pi) {
218 // We need to unregister color chips from the previous selection from the Color Model 214 // 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 @@
36 </script> 36 </script>
37</head> 37</head>
38<body> 38<body>
39 <div id="section"> 39 <div data-montage-id="section">
40 <h2 id="sectionSplitter" class="subSectionHeader"> 40 <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
41 <section class="arrow"><div class="arrowIcon animated"></div></section> 41 <section class="arrow"><div class="arrowIcon animated"></div></section>
42 <section class="title"></section> 42 <section class="title"></section>
43 </h2> 43 </h2>
44 <div id="sectionSlot" class="animated"></div> 44 <div data-montage-id="sectionSlot" class="animated"></div>
45 </div> 45 </div>
46</body> 46</body>
47</html> \ No newline at end of file 47</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 @@
38 </script> 38 </script>
39</head> 39</head>
40<body> 40<body>
41 <div id="section"> 41 <div data-montage-id="section">
42 <section class="fieldCol"> 42 <section class="fieldCol">
43 <article class="fieldRow colorSelect"> 43 <article class="fieldRow colorSelect">
44 <div id="Stroke"></div> 44 <div data-montage-id="Stroke"></div>
45 <div id="Fill"></div> 45 <div data-montage-id="Fill"></div>
46 </article> 46 </article>
47 </section> 47 </section>
48 </div> 48 </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 @@
44 </script> 44 </script>
45</head> 45</head>
46<body> 46<body>
47 <div id="section"> 47 <div data-montage-id="section">
48 <section class="fieldCol"> 48 <section class="fieldCol">
49 <label class="lbl"></label> 49 <label class="lbl"></label>
50 <article class="fieldRow"> 50 <article class="fieldRow">
51 <div id="slotElement" class="inputField"> 51 <div data-montage-id="slotElement" class="inputField">
52 52
53 </div> 53 </div>
54 </article> 54 </article>
55 <label class="lbl"></label> 55 <label class="lbl"></label>
56 <article class="fieldRow"> 56 <article class="fieldRow">
57 <div id="slotElement2" class="inputField"> 57 <div data-montage-id="slotElement2" class="inputField">
58 58
59 </div> 59 </div>
60 </article> 60 </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 @@
31 </script> 31 </script>
32</head> 32</head>
33<body> 33<body>
34 <div id="section"> 34 <div data-montage-id="section">
35 <section class="fieldCol"> 35 <section class="fieldCol">
36 <label><span class="lbl"></span></label> 36 <label><span class="lbl"></span></label>
37 <article class="fieldRow"> 37 <article class="fieldRow">
38 <div id="slotElement" class="inputField"> 38 <div data-montage-id="slotElement" class="inputField">
39 39
40 </div> 40 </div>
41 </article> 41 </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
49 </script> 49 </script>
50</head> 50</head>
51<body>