Merge branch 'pentool' into brushtool

Conflicts:
	imports/codemirror/mode/scheme/scheme.js
	js/tools/BrushTool.js

3 files changed, 6 insertions, 3 deletions

diff --git a/js/components/layout/documents-tab.reel/documents-tab.css b/js/components/layout/documents-tab.reel/documents-tab.css
index 689eb777..689eb777 100644..100755
--- a/js/components/layout/documents-tab.reel/documents-tab.css
+++ b/js/components/layout/documents-tab.reel/documents-tab.css
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 94b2e46e..737dfbcb 100644..100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -38,6 +38,11 @@
                         "boundObjectPropertyPath": "objectAtCurrentIteration.name",
                         "oneway": true
                     },
+                    "saveFlag": {
+                        "boundObject": {"@": "repetition1"},
+                        "boundObjectPropertyPath": "objectAtCurrentIteration.needsSave",
+                        "oneway": true
+                    },
                     "active": {
                         "boundObject": {"@": "repetition1"},
                         "boundObjectPropertyPath": "objectAtCurrentIteration.isActive",
diff --git a/js/components/layout/documents-tab.reel/documents-tab.js b/js/components/layout/documents-tab.reel/documents-tab.js
index e874a73c..982f6ecd 100644..100755
--- a/js/components/layout/documents-tab.reel/documents-tab.js
+++ b/js/components/layout/documents-tab.reel/documents-tab.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 = require("js/io/document/document-controller");
-
 exports.DocumentsTab = Montage.create(Component, {
 
     openDocuments: {
@@ -19,7 +17,7 @@ exports.DocumentsTab = Montage.create(Component, {
         enumerable: false,
         value: function() {
 //            console.log("Change this to be inside the Ninja Reel");
-            this.openDocuments = documentManagerModule.DocumentController._documents;
+            this.openDocuments = this.application.ninja.documentController._documents;
 //            this.eventManager.addEventListener( "appLoaded", this, false);
         }
     },