diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html')
-rwxr-xr-x | js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html index b6c25baf..b82124d0 100755 --- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html +++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.html | |||
@@ -9,8 +9,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
9 | <script type="text/montage-serialization"> | 9 | <script type="text/montage-serialization"> |
10 | { | 10 | { |
11 | "owner": { | 11 | "owner": { |
12 | "module": "js/panels/properties.reel/sections/three-d-view.reel", | 12 | "prototype": "js/panels/properties.reel/sections/three-d-view.reel[ThreeD]", |
13 | "name": "ThreeD", | ||
14 | "properties": { | 13 | "properties": { |
15 | "element": {"#": "section"}, | 14 | "element": {"#": "section"}, |
16 | "x3DControl": {"@": "threeDPosX"}, | 15 | "x3DControl": {"@": "threeDPosX"}, |
@@ -28,8 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
28 | }, | 27 | }, |
29 | 28 | ||
30 | "threeDPosX": { | 29 | "threeDPosX": { |
31 | "module": "js/components/hottextunit.reel", | 30 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
32 | "name": "HotTextUnit", | ||
33 | "properties": { | 31 | "properties": { |
34 | "element": {"#": "threeDPosX"}, | 32 | "element": {"#": "threeDPosX"}, |
35 | "identifier": "x3D", | 33 | "identifier": "x3D", |
@@ -57,8 +55,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
57 | ] | 55 | ] |
58 | }, | 56 | }, |
59 | "threeDPosY": { | 57 | "threeDPosY": { |
60 | "module": "js/components/hottextunit.reel", | 58 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
61 | "name": "HotTextUnit", | ||
62 | "properties": { | 59 | "properties": { |
63 | "element": {"#": "threeDPosY"}, | 60 | "element": {"#": "threeDPosY"}, |
64 | "identifier": "y3D", | 61 | "identifier": "y3D", |
@@ -86,8 +83,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
86 | ] | 83 | ] |
87 | }, | 84 | }, |
88 | "threeDPosZ": { | 85 | "threeDPosZ": { |
89 | "module": "js/components/hottextunit.reel", | 86 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
90 | "name": "HotTextUnit", | ||
91 | "properties": { | 87 | "properties": { |
92 | "element": {"#": "threeDPosZ"}, | 88 | "element": {"#": "threeDPosZ"}, |
93 | "identifier": "z3D", | 89 | "identifier": "z3D", |
@@ -115,8 +111,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
115 | ] | 111 | ] |
116 | }, | 112 | }, |
117 | "threeDRotX": { | 113 | "threeDRotX": { |
118 | "module": "js/components/hottextunit.reel", | 114 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
119 | "name": "HotTextUnit", | ||
120 | "properties": { | 115 | "properties": { |
121 | "element": {"#": "threeDRotX"}, | 116 | "element": {"#": "threeDRotX"}, |
122 | "identifier": "xAngle", | 117 | "identifier": "xAngle", |
@@ -146,8 +141,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
146 | ] | 141 | ] |
147 | }, | 142 | }, |
148 | "threeDRotY": { | 143 | "threeDRotY": { |
149 | "module": "js/components/hottextunit.reel", | 144 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
150 | "name": "HotTextUnit", | ||
151 | "properties": { | 145 | "properties": { |
152 | "element": {"#": "threeDRotY"}, | 146 | "element": {"#": "threeDRotY"}, |
153 | "identifier": "yAngle", | 147 | "identifier": "yAngle", |
@@ -177,8 +171,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
177 | ] | 171 | ] |
178 | }, | 172 | }, |
179 | "threeDRotZ": { | 173 | "threeDRotZ": { |
180 | "module": "js/components/hottextunit.reel", | 174 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
181 | "name": "HotTextUnit", | ||
182 | "properties": { | 175 | "properties": { |
183 | "element": {"#": "threeDRotZ"}, | 176 | "element": {"#": "threeDRotZ"}, |
184 | "identifier": "zAngle", | 177 | "identifier": "zAngle", |
@@ -208,15 +201,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
208 | ] | 201 | ] |
209 | }, | 202 | }, |
210 | "threeDPerspectiveDistance": { | 203 | "threeDPerspectiveDistance": { |
211 | "module": "js/components/hottextunit.reel", | 204 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
212 | "name": "HotTextUnit", | ||
213 | "properties": { | 205 | "properties": { |
214 | "element": {"#": "threeDPerspectiveDistance"} | 206 | "element": {"#": "threeDPerspectiveDistance"} |
215 | } | 207 | } |
216 | }, | 208 | }, |
217 | "axisModeGroup": { | 209 | "axisModeGroup": { |
218 | "module": "js/components/radio.reel", | 210 | "prototype": "js/components/radio.reel[RadioGroup]", |
219 | "name": "RadioGroup", | ||
220 | "properties": { | 211 | "properties": { |
221 | "name": "rotationLG", | 212 | "name": "rotationLG", |
222 | "selectedItem": {"@": "rdioLocal"}, | 213 | "selectedItem": {"@": "rdioLocal"}, |
@@ -224,8 +215,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
224 | } | 215 | } |
225 | }, | 216 | }, |
226 | "rdioLocal": { | 217 | "rdioLocal": { |
227 | "module": "js/components/radio.reel", | 218 | "prototype": "js/components/radio.reel", |
228 | "name": "Radio", | ||
229 | "properties": { | 219 | "properties": { |
230 | "element": {"#": "rdioLocal"}, | 220 | "element": {"#": "rdioLocal"}, |
231 | "label": "Local", | 221 | "label": "Local", |
@@ -235,8 +225,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
235 | } | 225 | } |
236 | }, | 226 | }, |
237 | "rdioGlobal": { | 227 | "rdioGlobal": { |
238 | "module": "js/components/radio.reel", | 228 | "prototype": "js/components/radio.reel", |
239 | "name": "Radio", | ||
240 | "properties": { | 229 | "properties": { |
241 | "element": {"#": "rdioGlobal"}, | 230 | "element": {"#": "rdioGlobal"}, |
242 | "label": "Global", | 231 | "label": "Global", |
@@ -245,8 +234,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
245 | } | 234 | } |
246 | }, | 235 | }, |
247 | "flattenCheckbox": { | 236 | "flattenCheckbox": { |
248 | "module": "montage/ui/checkbox.reel", | 237 | "prototype": "montage/ui/checkbox.reel", |
249 | "name": "Checkbox", | ||
250 | "properties": { | 238 | "properties": { |
251 | "element": {"#": "flattenCh"}, | 239 | "element": {"#": "flattenCh"}, |
252 | "identifier": "flatten", | 240 | "identifier": "flatten", |