Merge branch 'refs/heads/NinjaInternal' into Color

6 files changed, 44 insertions, 1 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() {
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.css b/js/components/ui/tree-basic/treeItem.reel/treeItem.css
index f8e67541..f8e67541 100644..100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.css
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.css
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.html b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
index 3c5b19a9..3c5b19a9 100644..100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.html
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.html
diff --git a/js/components/ui/tree-basic/treeItem.reel/treeItem.js b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
index 4c1c0977..755eab8c 100644..100755
--- a/js/components/ui/tree-basic/treeItem.reel/treeItem.js
+++ b/js/components/ui/tree-basic/treeItem.reel/treeItem.js
@@ -29,6 +29,17 @@ exports.TreeItem = Montage.create(Component, {
         value:true
     },
 
+    expandAfterDraw:{
+        writable:true,
+        enumerable:true,
+        value:false
+    },
+    highlightedUri:{
+        writable:true,
+        enumerable:true,
+        value:null
+    },
+
     directoryBold :{
         writable:true,
         enumerable:true,
@@ -85,6 +96,9 @@ exports.TreeItem = Montage.create(Component, {
             this.element.identifier = "treeItem";
             this.treeArrow.identifier = "treeArrow";
 
+            this.element.setAttribute("data-uri", this.treeItemData.uri);
+            this.element.setAttribute("data-type", this.treeItemData.type);
+
             //add arrow click handler for directory
             if(this.treeItemData.type === "directory"){
                 this.treeArrow.addEventListener("click", this, false);
@@ -107,7 +121,14 @@ exports.TreeItem = Montage.create(Component, {
             if(this.treeItemData.size){this.metadata = this.metadata + "<br />" + "Size: "+this.treeItemData.size;}
             if(this.treeItemData.creationDate){this.metadata = this.metadata + "<br />" + "Creation date: "+ this.formatTimestamp(this.treeItemData.creationDate);}
             if(this.treeItemData.modifiedDate){this.metadata = this.metadata + "<br />" + "Modified date: "+ this.formatTimestamp(this.treeItemData.modifiedDate);}
-        }
+
+            if((this.treeItemData.type === "directory") && (this.expandAfterDraw === true)){
+                this.toggleContent(this.treeArrow);
+            }
+            if(this.treeItemData.uri === this.highlightedUri){
+                this.itemName.classList.add("selected");
+            }
+        }
     },
 
     toggleContent:{