15 files changed, 88 insertions, 144 deletions

diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 74e89ac1..ac131f2c 100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -26,12 +26,12 @@ exports.Breadcrumb = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            if(!this._currentDocument) {
+            if(!value) {
                 this.disabled = true;
+            } else {
+                this.disabled = this._currentDocument.currentView !== "design";
             }
 
-            this.disabled = this._currentDocument.currentView !== "design";
-
         }
     },
 
@@ -51,15 +51,6 @@ exports.Breadcrumb = Montage.create(Component, {
         }
     },
 
-    handleCloseDocument: {
-        value: function(){
-            if(!this.application.ninja.documentController.activeDocument && this.application.ninja.currentDocument.currentView !== "code") {
-                this.disabled = true;
-                this.application.ninja.currentSelectedContainer = (this.application.ninja.currentDocument ? this.application.ninja.currentDocument.model.documentRoot : null);
-            }
-        }
-    },
-
     _container:{
         value:null
     },
@@ -82,7 +73,6 @@ exports.Breadcrumb = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.eventManager.addEventListener("closeDocument", this, false);
             this.breadcrumbBt.addEventListener("action", this, false);
         }
     },
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 6a7b0f3f..90d3a207 100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -105,7 +105,6 @@ exports.DocumentBar = Montage.create(Component, {
 
     prepareForDraw: {
         value: function() {
-            this.eventManager.addEventListener( "closeDocument", this, false);
             this.designView.addEventListener("click", this, false);
             this.codeView.addEventListener("click", this, false);
 
@@ -135,19 +134,5 @@ exports.DocumentBar = Montage.create(Component, {
             this.currentView = event._event.target.id;
             this.application.ninja.documentController.stage.stageView.switchDesignDocViews(event._event.target.id);//switch between design view
         }
-    },
-
-    handleCloseDocument: {
-        value: function() {
-            if(!this.application.ninja.documentController.activeDocument) {
-                this.disabled = true;
-            }
-        }
-    },
-
-    handleOnDocumentChanged:{
-        value:function(event){
-
-        }
     }
 });
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 34e307cb..94056007 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -9,10 +9,6 @@ var Component = require("montage/ui/component").Component;
 
 exports.DocumentEntry = Montage.create(Component, {
 
-    _uuid: {
-        value: null
-    },
-
     _document: {
         value: null
     },
@@ -23,16 +19,11 @@ 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;
-            }
         }
     },
 
@@ -87,7 +78,7 @@ exports.DocumentEntry = Montage.create(Component, {
 
     handleCloseButtonAction: {
         value: function() {
-            //this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
+            this.application.ninja.documentController.closeFile(this.document);
         }
     }
 
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index eba950b9..4f122b3b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -31,7 +31,7 @@ exports.DocumentController = Montage.create(Component, {
             return this._currentDocument;
         },
         set : function(value) {
-            if (value === this._currentDocument || value.getProperty("currentView") !== "design") {
+            if (value === this._currentDocument) {
                 return;
             }
 
@@ -41,7 +41,13 @@ exports.DocumentController = Montage.create(Component, {
 
             this._currentDocument = value;
 
-            this._currentDocument.model.currentView.show();
+            if(!value) {
+
+            }  else {
+                this._currentDocument.model.currentView.show();
+            }
+
+
 
         }
     },
@@ -323,7 +329,7 @@ exports.DocumentController = Montage.create(Component, {
 
     closeFile: {
         value: function(document) {
-            document.closeDocument(this, this.onCloseFile);
+            document.closeDocument(this.application.ninja, this.application.ninja.closeFile);
         }
     },
 
@@ -357,39 +363,6 @@ exports.DocumentController = Montage.create(Component, {
         }
     },
 
-    closeDocument: {
-        value: function(id) {
-            var doc = this._findDocumentByUUID(id);
-
-            var closeDocumentIndex = this._findIndexByUUID(id);
-            this._documents.splice(this._findIndexByUUID(id), 1);
-
-            if(this.activeDocument.uuid === id && this._documents.length > 0) {//closing the active document tab
-                var nextDocumentIndex = -1 ;
-                if((this._documents.length > 0) && (closeDocumentIndex === 0)){
-                    nextDocumentIndex = 0;
-                }else if((this._documents.length > 0) && (closeDocumentIndex > 0)){
-                    nextDocumentIndex = closeDocumentIndex - 1;
-                }
-                this.application.ninja.stage.stageView.switchDocument(this._documents[nextDocumentIndex]);
-                if(typeof doc.stopVideos !== "undefined"){doc.stopVideos();}
-                doc.container.parentNode.removeChild(doc.container);
-            }else if(this._documents.length === 0){
-                // See above
-            }else{//closing inactive document tab - just clear DOM