31 files changed, 23 insertions, 12 deletions
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
index 9d0a1eb4..9d0a1eb4 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.css
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
index b3fdb0b6..b3fdb0b6 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.html
diff --git a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
index 65e5b7c8..65e5b7c8 100644..100755
--- a/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
+++ b/js/components/layout/bread-crumb-button.reel/bread-crumb-button.js
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.css b/js/components/layout/bread-crumb.reel/bread-crumb.css
index cc984609..cc984609 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.css
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.css
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.html b/js/components/layout/bread-crumb.reel/bread-crumb.html
index 67328479..67328479 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 9782d9d1..9782d9d1 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
diff --git a/js/components/layout/document-bar.reel/document-bar.css b/js/components/layout/document-bar.reel/document-bar.css
index 588b8952..2a147964 100644..100755
--- a/js/components/layout/document-bar.reel/document-bar.css
+++ b/js/components/layout/document-bar.reel/document-bar.css
@@ -33,7 +33,7 @@
 .documentBar span{
    text-decoration: none;
-    cursor: default;
+    cursor: pointer;
    color: #3a3a3a;
 }
@@ -41,3 +41,10 @@
    color: white;
 }
+.documentBar .enable{
+    color: #d7d7d7;
+}
+.documentBar .disable{
+    color: #3a3a3a;
+}
+\ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html
index d58f0d14..48f1423c 100644..100755
--- a/js/components/layout/document-bar.reel/document-bar.html
+++ b/js/components/layout/document-bar.reel/document-bar.html
@@ -51,8 +51,8 @@
 <body>
    <div id="documentBar">
        <input class="zoomHotText label" id="zoomControlHT"/>
-        <span class="design-view" id="design">Design View</span>
+        <span class="design-view disable" id="design">Design View</span>
-        <span class="code-view" id="code">Code View</span>
+        <span class="code-view disable" id="code">Code View</span>
    </div>
 </body>
 </html>
 \ No newline at end of file
diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 3eece273..44f65804 100644..100755
--- a/js/components/layout/document-bar.reel/document-bar.js
+++ b/js/components/layout/document-bar.reel/document-bar.js
@@ -86,7 +86,7 @@ exports.DocumentBar = Montage.create(Component, {
        value: function() {
            this.designView.addEventListener("click", this, false);
            this.codeView.addEventListener("click", this, false);
-         
        }
    },
@@ -95,7 +95,13 @@ exports.DocumentBar = Montage.create(Component, {
            if(event._event.target.id === this.currentView) return;
            this.currentView = event._event.target.id;
-            documentManagerModule.DocumentManager.switchViews();
+            this.application.ninja.documentController.switchViews(event._event.target.id);//switch between design view
+        }
+    },
+    handleOnDocumentChanged:{
+        value:function(event){
        }
    }
 });
diff --git a/js/components/layout/document-entry.reel/close_button.gif b/js/components/layout/document-entry.reel/close_button.gif
index 00b5904b..00b5904b 100644..100755
--- a/js/components/layout/document-entry.reel/close_button.gif
+++ b/js/components/layout/document-entry.reel/close_button.gif
Binary files differ
diff --git a/js/components/layout/document-entry.reel/document-entry.css b/js/components/layout/document-entry.reel/document-entry.css
index ce173cd6..ce173cd6 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.css
+++ b/js/components/layout/document-entry.reel/document-entry.css
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index ba17449a..ba17449a 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
diff --git a/js/components/layout/document-entry.reel/document-entry.js b/js/components/layout/document-entry.reel/document-entry.js
index 6f265c91..1431e76f 100644..100755
--- a/js/components/layout/document-entry.reel/document-entry.js
+++ b/js/components/layout/document-entry.reel/document-entry.js
@@ -81,7 +81,7 @@ exports.DocumentEntry = Montage.create(Component, {
    prepareForDraw: {
        enumerable: false,
        value: function() {
-           //this.element.addEventListener("click", this, false);
+           this.element.addEventListener("click", this, false);
        }
    },
@@ -98,10 +98,10 @@ exports.DocumentEntry = Montage.create(Component, {
    handleClick: {
        value: function(event) {
            if(event._event.target.nodeName === "IMG") {
-                documentManagerModule.DocumentManager.closeDocument(this._uuid);
+                this.application.ninja.documentController.closeDocument(this._uuid);
            } else {
                if(!this._document.isActive) {
-                    documentManagerModule.DocumentManager.switchDocument(this._uuid);
+                    this.application.ninja.stage.stageView.switchCodeView(this.application.ninja.documentController._findDocumentByUUID(this._uuid));
                }
            }
        }
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..94b2e46e 100644..100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.html
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");