diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/tools-properties/object3d-properties.reel/object3d-properties.js | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel/object3d-properties.js')
-rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.js | 18 |
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 | ||