Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

2 files changed, 39 insertions, 23 deletions

diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index 1c144bf4..b22b3609 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -17,6 +17,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_0"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -24,6 +27,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_1"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -31,6 +37,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_2"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -38,6 +47,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_3"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -45,6 +57,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_4"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -52,6 +67,9 @@
                 "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_5"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
@@ -60,6 +78,9 @@
                 "name": "Panel",
                 "properties": {
                     "element": {"#": "panel_6"}
+                },
+                "bindings": {
+                    "currentDocument": {"<-": "@owner.currentDocument"}
                 }
             },
 
diff --git a/js/panels/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer.reel/PanelContainer.js
index 8d1d6a5e..7cb03255 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer.reel/PanelContainer.js
@@ -16,7 +16,24 @@ exports.PanelContainer = Montage.create(Component, {
         value: null
     },
 
-    // This will hold the current loaded panels.
+    _currentDocument: {
+        value : null,
+        enumerable : false
+    },
+
+    currentDocument : {
+        get : function() {
+            return this._currentDocument;
+        },
+        set : function(value) {
+            if (value === this._currentDocument) {
+                return;
+            }
+
+            this._currentDocument = value;
+        }
+    },
+
     panels: {
         value: []
     },
@@ -64,10 +81,6 @@ exports.PanelContainer = Montage.create(Component, {
             }
 
             this.application.localStorage.setItem("panels", this.currentPanelState);
-
-
-            this.eventManager.addEventListener( "onOpenDocument", this, false);
-            this.eventManager.addEventListener( "closeDocument", this, false);
         }
     },
  
@@ -89,24 +102,6 @@ exports.PanelContainer = Montage.create(Component, {
         }
     },
 
-    handleOnOpenDocument: {
-        value: function(){
-            this.panels.forEach(function(obj) {
-                obj.disabled = false;
-            });
-        }
-    },
-
-    handleCloseDocument: {
-        value: function(){
-            if(!this.application.ninja.documentController.activeDocument) {
-                this.panels.forEach(function(obj) {
-                    obj.disabled = true;
-                });
-            }
-        }
-    },
- 
     handleDropped: {
         value: function(e) {
             var draggedIndex, droppedIndex = 0, len = this.panels.length;