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, 6 insertions, 52 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 50b3624c..94056007 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -9,15 +9,7 @@ var Component = require("montage/ui/component").Component;
 
 exports.DocumentEntry = Montage.create(Component, {
 
-    dirty: { value: null },
-
-    _uuid: {
-        value: null,
-        enumerable: false
-    },
-
     _document: {
-        enumerable: false,
         value: null
     },
 
@@ -27,20 +19,17 @@ exports.DocumentEntry = Montage.create(Component, {
             return this._document;
         },
         set: function(value) {
-
             if (this._document === value) {
                 return;
             }
 
             this._document = value;
-
-            if(value) {
-                this._uuid = value.uuid;
-            }
         }
     },
 
-    _name: { value: null },
+    _name: {
+        value: null
+    },
 
     name: {
         enumerable: false,
@@ -58,25 +47,6 @@ exports.DocumentEntry = Montage.create(Component, {
         }
     },
 
-    _active: {
-        enumerable: false,
-        value: null
-    },
-
-    active: {
-        get: function() {
-            return this._active;
-        },
-        set: function(value) {
-            var previousValue = this._active;
-            this._active = value;
-
-            if (previousValue !== this._active) {
-                this.needsDraw = true;
-            }
-        }
-    },
-
     _saveFlag: {
         value: false
     },
@@ -93,21 +63,11 @@ exports.DocumentEntry = Montage.create(Component, {
         }
     },
 
-    prepareForDraw: {
-        enumerable: false,
-        value: function() {
-           this.element.addEventListener("click", this, false);
-        }
-    },
-
-
     draw: {
         enumerable: false,
         value: function() {
             this.label.innerText = this._name ? this._name : "";
 
-            this._active ? this.element.classList.add("activeTab") : this.element.classList.remove("activeTab");
-
             if(this.saveFlag) {
                 this.label.classList.add("dirty");
             } else {
@@ -116,15 +76,9 @@ exports.DocumentEntry = Montage.create(Component, {
         }
     },
 
-    handleClick: {
-        value: function(event) {
-            if(event._event.target.nodeName === "IMG") {
-                this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
-            } else {
-                if(!this.active) {
-                    this.application.ninja.documentController.switchDocuments(this.application.ninja.currentDocument, this.application.ninja.documentController._findDocumentByUUID(this._uuid));
-                }
-            }
+    handleCloseButtonAction: {
+        value: function() {
+            this.application.ninja.documentController.closeFile(this.document);
         }
     }