Merge branch 'pentool' into brushtool

2 files changed, 7 insertions, 39 deletions

diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 304c8871..04b2bd7b 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
@@ -28,22 +28,19 @@
                 "bindings": {
                     "document": {"<-": "@repetition1.objectAtCurrentIteration"},
                     "name":     {"<-": "@repetition1.objectAtCurrentIteration.model.file.name"},
-                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"},
-                    "active":   {"<-": "@repetition1.objectAtCurrentIteration.model.isActive"}
+                    "saveFlag": {"<-": "@repetition1.objectAtCurrentIteration.model.needsSave"}
                 }
             },
             
             "repetition1": {
                 "prototype": "montage/ui/repetition.reel",
                 "properties": {
-                    "element": {"#": "openDocuments"}
+                    "element": {"#": "openDocuments"},
+                    "isSelectionEnabled": true
                 },
                 "bindings": {
-                    "objects": {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "openDocuments",
-                        "oneway": true
-                    }
+
+                    "contentController": {"<-": "@owner.contentController"}
                 }
             }
 
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