aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
diff options
context:
space:
mode:
authorJon Reid2012-05-22 10:40:40 -0700
committerJon Reid2012-05-22 10:40:40 -0700
commitd43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch)
tree1c78ccc588f04bac9bff4de82e527a128162cf4f /js/components/tools-properties/object3d-properties.reel/object3d-properties.js
parent1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff)
parent0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff)
downloadninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.js')
-rwxr-xr-xjs/components/tools-properties/object3d-properties.reel/object3d-properties.js18
1 files changed, 11 insertions, 7 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
index afcb2400..d7f0976c 100755
--- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
+++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.js
@@ -14,17 +14,21 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
14 rotateGlobally: { value: null, enumerable: false }, 14 rotateGlobally: { value: null, enumerable: false },
15 15
16 _subPrepare: { 16 _subPrepare: {
17 value: function() { 17 value: function () {
18 this.rotateLocally.addEventListener("click", this, false); 18 this.rotateLocally.addEventListener("click", this, false);
19 this.rotateGlobally.addEventListener("click", this, false); 19 this.rotateGlobally.addEventListener("click", this, false);
20 } 20 }
21 }, 21 },
22 22
23 handleClick: { 23 handleClick: {
24 value: function(event) { 24 value: function (event) {
25 this.selectedMode = event._event.target.id; 25 if (event._event.target === this.rotateLocally) {
26 26 this.selectedMode = "rotateLocally";
27 NJevent("toolOptionsChange", {source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally")}); 27 } else {
28 this.selectedMode = "rotateGlobally";
29 }
30
31 NJevent("toolOptionsChange", { source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally") });
28 } 32 }
29 }, 33 },
30 34
@@ -33,8 +37,8 @@ exports.Object3DProperties = Montage.create(ToolProperties, {
33 }, 37 },
34 38
35 selectedMode: { 39 selectedMode: {
36 get: function() { return this._selectedMode;}, 40 get: function () { return this._selectedMode; },
37 set: function(value) { this._selectedMode = value; } 41 set: function (value) { this._selectedMode = value; }
38 } 42 }
39 43
40 44