diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/tools-properties/object3d-properties.reel | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/object3d-properties.reel')
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.html | 6 | ||||
| -rwxr-xr-x | js/components/tools-properties/object3d-properties.reel/object3d-properties.js | 18 |
2 files changed, 14 insertions, 10 deletions
diff --git a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html index 1c9505a0..70ed79f9 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html | |||
| @@ -30,9 +30,9 @@ | |||
| 30 | 30 | ||
| 31 | <body> | 31 | <body> |
| 32 | <div data-montage-id="object3DProperties" class="subToolHolderPanel"> | 32 | <div data-montage-id="object3DProperties" class="subToolHolderPanel"> |
| 33 | <div id="rotateObjectToolContainer" class="tagRadioButtons"> | 33 | <div class="tagRadioButtons object3DToolContainer"> |
| 34 | <input type="radio" data-montage-id="rotateLocally" id="rotateLocally" class="tag-type" title="Rotate Locally" name="rotateObject" checked/> | 34 | <input type="radio" data-montage-id="rotateLocally" class="toolOptsRadioButton rotateLocally" title="Rotate Locally" name="rotateObject" checked/> |
| 35 | <input type="radio" data-montage-id="rotateGlobally" id="rotateGlobally" class="tag-type" title="Rotate Globally" name="rotateObject"/> | 35 | <input type="radio" data-montage-id="rotateGlobally" class="toolOptsRadioButton rotateGlobally" title="Rotate Globally" name="rotateObject"/> |
| 36 | </div> | 36 | </div> |
| 37 | </div> | 37 | </div> |
| 38 | </body> | 38 | </body> |
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 | ||