2 files changed, 9 insertions, 25 deletions

diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 9e4110e2..ad0236c6 100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -7,8 +7,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-//var documentManagerModule = ("js/document/documentManager");
-
 exports.DocumentEntry = Montage.create(Component, {
 
     dirty: { value: null },
@@ -35,8 +33,10 @@ exports.DocumentEntry = Montage.create(Component, {
             }
 
             this._document = value;
-            this._uuid = value.uuid;
-            //this.needsDraw = true;
+
+            if(value) {
+                this._uuid = value.uuid;
+            }
         }
     },
 
@@ -119,7 +119,7 @@ exports.DocumentEntry = Montage.create(Component, {
     handleClick: {
         value: function(event) {
             if(event._event.target.nodeName === "IMG") {
-                this.application.ninja.documentController.closeDocument(this._uuid);
+                this.application.ninja.documentController.closeFile(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
             } else {
                 if(!this._document.isActive) {
                     this.application.ninja.stage.stageView.switchDocument(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 4aed23d9..304c8871 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -26,26 +26,10 @@
                     "element": {"#": "document"}
                 },
                 "bindings": {
-                    "document": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration",
-                        "oneway": true
-                    },
-                    "name": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.name",
-                        "oneway": true
-                    },
-                    "saveFlag": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave",
-                        "oneway": true
-                    },
-                    "active": {
-                        "boundObject": {"@": "repetition1"},
-                        "boundObjectPropertyPath": "objectAtCurrentIteration.isActive",
-                        "oneway": true
-                    }
+                    "document": {"<-": "@repetition1.objectAtCurrentIteration"},
+                    "name":     {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
+                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
+                    "active":   {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
                 }
             },