Merge branch 'pentool' into brushtool

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

3 files changed, 22 insertions, 0 deletions

diff --git a/js/components/ui/tree-basic/tree.reel/tree.css b/js/components/ui/tree-basic/tree.reel/tree.css
index 878068b7..878068b7 100644..100755
--- a/js/components/ui/tree-basic/tree.reel/tree.css
+++ b/js/components/ui/tree-basic/tree.reel/tree.css
diff --git a/js/components/ui/tree-basic/tree.reel/tree.html b/js/components/ui/tree-basic/tree.reel/tree.html
index ba594926..1990a4ef 100644..100755
--- a/js/components/ui/tree-basic/tree.reel/tree.html
+++ b/js/components/ui/tree-basic/tree.reel/tree.html
@@ -26,6 +26,16 @@
                     "boundObject": {"@": "owner"},
                     "boundObjectPropertyPath": "showIcons",
                     "oneway": true
+                },
+                "expandAfterDraw": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "expandTreeAfterDraw",
+                    "oneway": true
+                },
+                "highlightedUri": {
+                    "boundObject": {"@": "owner"},
+                    "boundObjectPropertyPath": "highlightedUri",
+                    "oneway": true
                 }
             }
         },
diff --git a/js/components/ui/tree-basic/tree.reel/tree.js b/js/components/ui/tree-basic/tree.reel/tree.js
index 67fa20e5..d507eee5 100644..100755
--- a/js/components/ui/tree-basic/tree.reel/tree.js
+++ b/js/components/ui/tree-basic/tree.reel/tree.js
@@ -21,6 +21,18 @@ exports.Tree = Montage.create(Component, {
         value:true
     },
 
+    expandTreeAfterDraw:{
+        writable:true,
+        enumerable:true,
+        value:false
+    },
+
+    highlightedUri:{
+        writable:true,
+        enumerable:true,
+        value:null
+    },
+
     willDraw: {
         enumerable: false,
         value: function() {