Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 25 insertions, 21 deletions

diff --git a/js/components/layout/tools-properties.reel/tools-properties.js b/js/components/layout/tools-properties.reel/tools-properties.js
index 47945b58..6ea4ad85 100755
--- a/js/components/layout/tools-properties.reel/tools-properties.js
+++ b/js/components/layout/tools-properties.reel/tools-properties.js
@@ -9,36 +9,40 @@ var Component = require("montage/ui/component").Component;
 
 exports.ToolsProperties = Montage.create(Component, {
 
-    disabled: {
-        value: true
+    _currentDocument: {
+        enumerable: false,
+        value: null
     },
 
-    handleCloseDocument: {
-        value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
-                this.disabled = true;
+    currentDocument: {
+        enumerable: false,
+        get: function() {
+            return this._currentDocument;
+        },
+        set: function(value) {
+            if (value === this._currentDocument) {
+                return;
             }
-        }
-    },
 
-    handleOpenDocument: {
-        value: function() {
-            this.disabled = false;
+            this._currentDocument = value;
+
+            this.disabled = !this._currentDocument;
+
         }
     },
 
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-            this.eventManager.addEventListener( "openDocument", this, false);
-            this.eventManager.addEventListener( "closeDocument", this, false);
-        }
+    _disabled: {
+        value: true
     },
 
-    draw: {
-        enumerable: false,
-        value: function() {
-            //this.selectionProperties.needsDraw = true;
+    disabled: {
+        get: function() {
+            return this._disabled;
+        },
+        set: function(value) {
+            if(value !== this._disabled) {
+                this._disabled = value;
+            }
         }
     },