Merge branch 'master' into brushtool

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

1 files changed, 21 insertions, 0 deletions

diff --git a/js/components/checkbox.reel/checkbox.js b/js/components/checkbox.reel/checkbox.js
index f06e5830..be331f4e 100755
--- a/js/components/checkbox.reel/checkbox.js
+++ b/js/components/checkbox.reel/checkbox.js
@@ -58,6 +58,26 @@ exports.Checkbox = Montage.create(Component, {
         }
     },
 
+    _enabled: {
+        enumerable: false,
+        value: true
+    },
+
+    enabled: {
+        enumerable: true,
+        serializable: true,
+        get: function() {
+            return this._enabled;
+        },
+        set: function(value) {
+            if(value !== this._enabled)
+            {
+                this._enabled = value;
+                this.needsDraw = true;
+            }
+        }
+    },
+
     handleChange:
     {
         value:function(event)
@@ -76,6 +96,7 @@ exports.Checkbox = Montage.create(Component, {
     
     draw: {
         value: function() {
+            this.element.disabled = !this._enabled;
             if(!this._valueSyncedWithInputField)
             {
                 this.element.checked = this._checked;