Merge branch 'refs/heads/NinjaInternal' into Color

8 files changed, 49 insertions, 15 deletions

diff --git a/js/components/controllers/tree-controller.js b/js/components/controllers/tree-controller.js
index 03ef7b9e..1e9222fd 100644
--- a/js/components/controllers/tree-controller.js
+++ b/js/components/controllers/tree-controller.js
@@ -28,7 +28,7 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
     },
 
     branchKey : {
-        value: 'children'
+        value: null
     },
 
     _root : {
@@ -98,7 +98,8 @@ var TreeController = exports.TreeController = Montage.create(ObjectController, /
    },
 
     branchControllers: {
-        value: []
+        value: [],
+        distinct: true
     },
 
     addBranchController : {
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.css b/js/components/treeview/ninja-branch.reel/ninja-branch.css
index d8c212e8..a3a9350e 100644
--- a/js/components/treeview/ninja-branch.reel/ninja-branch.css
+++ b/js/components/treeview/ninja-branch.reel/ninja-branch.css
@@ -26,7 +26,7 @@
     cursor: pointer;
     font-weight: bold;
     padding: 3px 0 4px;
-    text-shadow: 1px 1px 0 #000;
+    text-shadow: 1px 1px 1px #000;
 }
 
 /* First Level */
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
index 085b11e0..fedc1d9d 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.css
@@ -19,7 +19,6 @@
 /* Second level */
 .branch .branch .leaf-label {
     background-position: 25px center;
-    box-shadow: 0 3px 4px -4px rgba(0,0,0,0.2);
     color: #FFF;
     padding-left: 45px;
 }
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index c6416693..1bfe66a4 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -63,7 +63,8 @@ exports.Leaf = Montage.create(TreeNode, {
             'dblclick'  : 'handleDblclick',
             'dragstart' : 'handleDragStart',
             'dragend'   : 'handleDragEnd'
-        }
+        },
+        distinct: true
     }
 
 
diff --git a/js/components/treeview/tree-node.js b/js/components/treeview/tree-node.js
index 689fc233..d7b864b5 100644
--- a/js/components/treeview/tree-node.js
+++ b/js/components/treeview/tree-node.js
@@ -44,7 +44,9 @@ exports.TreeNode = Montage.create(Component, {
             if(!object) {
                 return;
             }
+
             if(object[this.branchKey]) {
+                this.childNodes.length = 0;
                 object[this.branchKey].forEach(function(node) {
                     this.childNodes.push(node);
                 }, this);
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 9c85c6b5..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -6,7 +6,7 @@
 
 .picker{
     font-size:12px;
-    width:510px;
+    width:523px;
     height:500px;
     padding-top:15px;
     padding-left:15px;
@@ -53,6 +53,7 @@
     height:75%;
     width:auto;
     border-right: none;
+    margin: 8px 0px 0px 8px;
 }
 
 .picker .right-bottom{
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 6b0d92f7..411386f9 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -203,6 +203,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                 this.pickerModel.storeHistory(this.pickerModel.currentRoot);//populate history
 
                 this.updateMetadata(this.currentURI);
+
+                //for directory selection, selected url is the folder entered
+                if(!this.pickerModel.inFileMode ){
+                    this.okButton.removeAttribute("disabled");
+                    //put into selectedItems..currently single selection is supported
+                    this.selectedItems = [this.pickerModel.currentRoot];
+                }
             }
 
             this.element.addEventListener("openFolder", function(evt){that.handlePickerNavOpenFolder(evt);}, false);//add icon double click event listener to reload iconList with new set of data
@@ -211,6 +218,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.element.addEventListener("updateMetadata", function(evt){that.handlePickerNavUpdateMetadata(evt);}, false);//show metadata on click of icon
             //this.addressGo.addEventListener("click", this, false);
             this.addressBarUri.addEventListener("keydown", this, false);
+            this.addressBarUri.addEventListener("keyup", this, false);
             this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
             this.backArrow.addEventListener("click", this, false);
             this.forwardArrow.addEventListener("click", this, false);
@@ -608,6 +616,13 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.backArrow.classList.remove("disable");
                     }
 
+                    //for directory selection, selected url is the folder entered
+                    if(!this.pickerModel.inFileMode ){
+                        this.okButton.removeAttribute("disabled");
+                        //put into selectedItems..currently single selection is supported
+                        this.selectedItems = [evt.folderUri];
+                    }
+
                 }
     },
 
@@ -720,6 +735,21 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
               }
     },
 
+    handleAddressBarUriKeyup:{
+        value: function(evt){
+            //disable ok if user enters an invalid uri
+            if(!this.application.ninja.coreIoApi.isValidUri(this.addressBarUri.value)){
+                //disable OK
+                if(!this.okButton.hasAttribute("disabled")){
+                    this.okButton.setAttribute("disabled", "true");
+                }
+            }else{
+                this.okButton.removeAttribute("disabled");
+                this.selectedItems = [this.addressBarUri.value];
+            }
+        }
+    },
+
     handleRefreshButtonClick:{
         value:function(evt){
                 var uri = this.addressBarUri.value;
@@ -794,7 +824,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
     handleOkButtonAction : {
         value: function(evt){
-                    console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
+                    //console.log("$$$ File Picker : selected "+ this.selectedItems.toString());
                     var success = true;
                     if(!!this.pickerModel.callback && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 4d71f6b8..9fb180d2 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -5,14 +5,14 @@
  </copyright> */