aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/three-d-view.reel
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-06 00:25:27 -0700
committerValerio Virgillito2012-06-06 00:25:27 -0700
commit0e1a276f19ea70009c5a649e9667861d7c346a7e (patch)
tree6db7675bbe89746ba47002bba306da42a7261312 /js/panels/properties.reel/sections/three-d-view.reel
parentf7e4257745ccd44b8d24555f0ef787429d6e472c (diff)
downloadninja-0e1a276f19ea70009c5a649e9667861d7c346a7e.tar.gz
first iteration of adding serializable to ninja plus other changes to run the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/panels/properties.reel/sections/three-d-view.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.html2
-rwxr-xr-xjs/panels/properties.reel/sections/three-d-view.reel/three-d-view.js55
2 files changed, 55 insertions, 2 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 5ef13fab..572e5a60 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
@@ -219,7 +219,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
219 "properties": { 219 "properties": {
220 "element": {"#": "rdioLocal"}, 220 "element": {"#": "rdioLocal"},
221 "label": "Local", 221 "label": "Local",
222 "value": "Local",
223 "group": {"@": "axisModeGroup"}, 222 "group": {"@": "axisModeGroup"},
224 "checked": true 223 "checked": true
225 } 224 }
@@ -229,7 +228,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
229 "properties": { 228 "properties": {
230 "element": {"#": "rdioGlobal"}, 229 "element": {"#": "rdioGlobal"},
231 "label": "Global", 230 "label": "Global",
232 "value": "Global",
233 "group": {"@": "axisModeGroup"} 231 "group": {"@": "axisModeGroup"}
234 } 232 }
235 }, 233 },
diff --git a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
index 104d474d..70fca99b 100755
--- a/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
+++ b/js/panels/properties.reel/sections/three-d-view.reel/three-d-view.js
@@ -51,6 +51,61 @@ exports.ThreeD = Montage.create(Component, {
51 } 51 }
52 }, 52 },
53 53
54 x3DControl: {
55 value: null,
56 serializable: true
57 },
58
59 y3DControl: {
60 value: null,
61 serializable: true
62 },
63
64 z3DControl: {
65 value: null,
66 serializable: true
67 },
68
69 x3DLabel: {
70 value: null,
71 serializable: true
72 },
73
74 y3DLabel: {
75 value: null,
76 serializable: true
77 },
78
79 z3DLabel: {
80 value: null,
81 serializable: true
82 },
83
84 xAngleControl: {
85 value: null,
86 serializable: true
87 },
88
89 yAngleControl: {
90 value: null,
91 serializable: true
92 },
93
94 zAngleControl: {
95 value: null,
96 serializable: true
97 },
98
99 axisModeGroupControl: {
100 value: null,
101 serializable: true
102 },
103
104 flattenControl: {
105 value: null,
106 serializable: true
107 },
108
54 x3D: { 109 x3D: {
55 value: 0 110 value: 0
56 }, 111 },