Merge branch 'pentool' into brushtool

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

1 files changed, 8 insertions, 2 deletions

diff --git a/js/components/layout/document-bar.reel/document-bar.js b/js/components/layout/document-bar.reel/document-bar.js
index 3eece273..ea5e3280 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.stage.stageView.switchViews(event._event.target.id);//switch between design view
+        }
+    },
+
+    handleOnDocumentChanged:{
+        value:function(event){
+
         }
     }
 });