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>

1 files changed, 2 insertions, 31 deletions

diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js
index 982f6ecd..41c98b30 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.js
+++ b/js/components/layout/documents-tab.reel/documents-tab.js
@@ -8,36 +8,7 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
 exports.DocumentsTab = Montage.create(Component, {
-
-    openDocuments: {
-        value: []
-    },
-
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-//            console.log("Change this to be inside the Ninja Reel");
-            this.openDocuments = this.application.ninja.documentController._documents;
-//            this.eventManager.addEventListener( "appLoaded", this, false);
-        }
-    },
-
-    handleAppLoaded: {
-        value: function() {
-//            this.openDocuments = this.application.ninja.currentDocument;
-        }
-    },
-
-    draw: {
-        enumerable: false,
-        value: function() {
-
-        }
-    },
-
-    handleClick: {
-        value: function(event) {
-            
-        }
+    contentController: {
+        value: null
     }
 });
\ No newline at end of file