From b8dc3c42715274e61b34dc3c65e023078123f2e2 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Mon, 30 Apr 2012 15:34:16 -0700 Subject: fixing the menu and tool properties Signed-off-by: Valerio Virgillito --- .../object3d-properties.reel/object3d-properties.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/components/tools-properties/object3d-properties.reel') 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 58c29db5..1c9505a0 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html @@ -29,10 +29,10 @@ -
+
- - + +
-- cgit v1.2.3 From 7dedf0735eec1d227b21291e1bb43dcdec93cbf3 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 8 May 2012 09:55:02 -0700 Subject: -Removed id dependence of the tag tool options CSS -Separated the options3d CSS from the tag tool options css -Removed unused translateObjectToolContainer CSS class --- .../object3d-properties.reel/object3d-properties.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js/components/tools-properties/object3d-properties.reel') 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..17bafacd 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 @@
-
- - +
+ +
-- cgit v1.2.3 From 9539e778dd678cec90cf83528df69a189be3a192 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Tue, 15 May 2012 15:24:13 -0700 Subject: updated object 3D options bar to use the new radio styles removed its use of the sprite sheet --- .../object3d-properties.reel/object3d-properties.html | 4 ++-- .../object3d-properties.reel/object3d-properties.js | 18 +++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) (limited to 'js/components/tools-properties/object3d-properties.reel') 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 17bafacd..70ed79f9 100755 --- a/js/components/tools-properties/object3d-properties.reel/object3d-properties.html +++ b/js/components/tools-properties/object3d-properties.reel/object3d-properties.html @@ -31,8 +31,8 @@
- - + +
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, { rotateGlobally: { value: null, enumerable: false }, _subPrepare: { - value: function() { + value: function () { this.rotateLocally.addEventListener("click", this, false); this.rotateGlobally.addEventListener("click", this, false); } }, handleClick: { - value: function(event) { - this.selectedMode = event._event.target.id; - - NJevent("toolOptionsChange", {source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally")}); + value: function (event) { + if (event._event.target === this.rotateLocally) { + this.selectedMode = "rotateLocally"; + } else { + this.selectedMode = "rotateGlobally"; + } + + NJevent("toolOptionsChange", { source: "Object3DProperties", mode: (this.selectedMode === "rotateLocally") }); } }, @@ -33,8 +37,8 @@ exports.Object3DProperties = Montage.create(ToolProperties, { }, selectedMode: { - get: function() { return this._selectedMode;}, - set: function(value) { this._selectedMode = value; } + get: function () { return this._selectedMode; }, + set: function (value) { this._selectedMode = value; } } -- cgit v1.2.3