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>

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, {
     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; }
     }