Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 8 insertions, 12 deletions

diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.js b/js/components/tools-properties/rect-properties.reel/rect-properties.js
index b2de6ff7..f023f4bb 100755
--- a/js/components/tools-properties/rect-properties.reel/rect-properties.js
+++ b/js/components/tools-properties/rect-properties.reel/rect-properties.js
@@ -19,7 +19,8 @@ exports.RectProperties = Montage.create(ToolProperties, {
 
     _subPrepare: {
         value: function() {
-            this.lockButton.addEventListener("click", this, false);
+            this.lockButton.identifier = "lockButton";
+            this.lockButton.addEventListener("action", this, false);
 
             this._setBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
             this._setCap([this.TLRadiusControl,this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
@@ -27,21 +28,16 @@ exports.RectProperties = Montage.create(ToolProperties, {
         }
     },
 
-    handleClick: {
+    handleLockButtonAction: {
         value: function(event) {
-            this._unlocked = !this._unlocked;
+            this.TRRadiusControl.enabled = this.BLRadiusControl.enabled = this.BRRadiusControl.enabled = !this.lockButton.pressed;
 
-            this.TRRadiusControl.enabled = this.BLRadiusControl.enabled = this.BRRadiusControl.enabled = this._unlocked;
-
-            if(this._unlocked) {
-                this.lockButton.classList.remove("LockToolUp");
-                this.lockButton.classList.add("UnLockToolUp");
-                this._removeBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
-            } else {
-                this.lockButton.classList.remove("UnLockToolUp");
-                this.lockButton.classList.add("LockToolUp");
+            if(this.lockButton.pressed) {
                 this._setBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
+            } else {
+                this._removeBindings([this.TRRadiusControl, this.BLRadiusControl, this.BRRadiusControl]);
             }
+
         }
     },