Merge branch 'pentool' into brushtool

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

31 files changed, 117 insertions, 90 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..3f5b87e1 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
@@ -7,45 +7,38 @@
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-
 exports.BreadcrumbButton = Montage.create(Component, {
 
-    button:     { value: null },
+    button: {
+        value: null
+    },
 
-    data:       { value: null },
+    data: {
+        value: null
+    },
 
     prepareForDraw: {
-        enumerable: false,
         value: function() {
             this.element.addEventListener("mousedown", this, false);
         }
     },
 
     draw: {
-        enumerable: false,
         value: function() {
-
-        if(this.data.element.id==="UserContent"){
-
-           this.button.innerHTML = "Body";
-        }
-
-        else{
-           this.button.innerHTML=this.data.element.nodeName;
-        }
-
+            if(this.data.element.id === "UserContent") {
+                this.button.innerHTML = "Body";
+            } else {
+                this.button.innerHTML = this.data.element.nodeName;
+            }
         }
     },
 
     handleMousedown: {
         value: function(event) {
 
-            if(event.which===1){
-
-                 this.data.selected=true;
-                 NJevent('breadCrumbTrail',this.data);
-                 this.data.selected=false;
-            }
+             //this.data.selected=true;
+             NJevent('breadCrumbTrail',this.data);
+             //this.data.selected=false;
 
         }
     }
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..c1b9ed61 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.html
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.html
@@ -62,7 +62,7 @@
 
         <div id="breadcrumb_trail" class="breadcrumbtrail">
             <div id="breadcrumb_container" class="bread_crumb">
-                <div id="breadcrumb_button" class="toolbutton"></div>
+                <div id="breadcrumb_button"></div>
             </div>
         </div>
 
diff --git a/js/components/layout/bread-crumb.reel/bread-crumb.js b/js/components/layout/bread-crumb.reel/bread-crumb.js
index 9782d9d1..1824c7c3 100644..100755
--- a/js/components/layout/bread-crumb.reel/bread-crumb.js
+++ b/js/components/layout/bread-crumb.reel/bread-crumb.js
@@ -7,13 +7,12 @@
 var Montage = require("montage/core/core").Montage,
     Component = require("montage/ui/component").Component;
 
-exports.Breadcrumb = Montage.create(Component, {
+var Breadcrumb = exports.Breadcrumb = Montage.create(Component, {
 
     _container:{
         value:null
     },
 
-
     container: {
         set: function(value) {
             if(this._container !== value) {
@@ -30,10 +29,10 @@ exports.Breadcrumb = Montage.create(Component, {
         value: []
     },
 
+
     deserializedFromTemplate : {
         value: function() {
             this.eventManager.addEventListener( "appLoaded", this, false);
-            this.eventManager.addEventListener( "openDocument", this, false);
             this.eventManager.addEventListener( "breadCrumbTrail", this, false);
         }
     },
@@ -46,6 +45,7 @@ exports.Breadcrumb = Montage.create(Component, {
                     boundObjectPropertyPath: "currentSelectedContainer",
                     oneway: false
             });
+
         }
     },
 
@@ -53,47 +53,47 @@ exports.Breadcrumb = Montage.create(Component, {
         value: function() {
             var parentNode;
 
-            while(this.containerElements.pop()){
-              // To empty the array to get the new parentNode of the new currentLevel
-            }
+            this.containerElements.length = 0
 
             if(this.container.id === "UserContent") {
-                this.containerElements.push({selected:false,element:this.container});
+                this.containerElements.push({selected:false, element:this.container});
             } else {
-