1 files changed, 46 insertions, 35 deletions

diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
index 299d44f5..d7a19c14 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.js
@@ -209,26 +209,27 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.refreshButton.addEventListener("click", this, false);//refresh - gets from file system directly
             this.backArrow.addEventListener("click", this, false);
             this.forwardArrow.addEventListener("click", this, false);
-            this.okButton.addEventListener("click", this, false);
-            this.cancelButton.addEventListener("click", this, false);
-
-            //populate filters
-            var filtersDD = this.element.querySelector(".filters .dropdown");
-            if(!!this.pickerModel.fileFilters
-                && (typeof this.pickerModel.fileFilters === "object")
-                && ('splice' in this.pickerModel.fileFilters)
-                && ('join' in this.pickerModel.fileFilters)){
-                this.pickerModel.fileFilters.forEach(function(aFilter){
-                    var newDiv = document.createElement("div");
-                    newDiv.innerHTML = aFilter;
-                    filtersDD.appendChild(newDiv);
-                    newDiv.addEventListener("click", function(evt){that.handleFilterClick(evt, aFilter, filtersDD)}, false);
-                }, this);
-            }
 
-            var renderedWidth = this.getComputedWidth(filtersDD);
-            this.filters.style.width = "" + (parseInt((renderedWidth.substring(0, (renderedWidth.length - 2)))) + 20) + "px";
+            //populate filters if in file selection mode
+            if(this.pickerModel.inFileMode === true){
+                var filtersDD = this.element.querySelector(".filters .dropdown");
+                if(!!this.pickerModel.fileFilters
+                    && (typeof this.pickerModel.fileFilters === "object")
+                    && ('splice' in this.pickerModel.fileFilters)
+                    && ('join' in this.pickerModel.fileFilters)){
+                    this.pickerModel.fileFilters.forEach(function(aFilter){
+                        var newDiv = document.createElement("div");
+                        newDiv.innerHTML = aFilter;
+                        filtersDD.appendChild(newDiv);
+                        newDiv.addEventListener("click", function(evt){that.handleFilterClick(evt, aFilter, filtersDD)}, false);
+                    }, this);
+                }
 
+                var renderedWidth = this.getComputedWidth(filtersDD);
+                this.filters.style.width = "" + (parseInt((renderedWidth.substring(0, (renderedWidth.length - 2)))) + 20) + "px";
+            }else{
+                this.filters.style.display = "none";
+            }
             /**
              * attach click event listeners to the addressbar dropdown arrows
              */
@@ -244,6 +245,9 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.resultsArea.addEventListener("click", function(evt){that.handleResultsAreaClick(evt);}, false);
             this.element.addEventListener("click", function(evt){that.handlePickerNavClick(evt);}, false);
 
+            this.okButton.addEventListener("click", function(evt){that.handleOkButtonAction(evt);}, false);
+            this.cancelButton.addEventListener("click", function(evt){that.handleCancelButtonAction(evt);}, false);
+
             //ready to show picker now
             this.element.style.visibility = "visible";
         }
@@ -263,11 +267,11 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         }
     },
 
-    //TODO: add uri pattern validation 
-    validateUri:{
+    cleanupUri:{
         writable: false,
         enumerable:true,
         value: function(folderUri){
+            folderUri = folderUri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
             //remove unnecessary / from end - for Win and Mac .... don't trim for the root
             if(((folderUri.charAt(folderUri.length - 1) === "/") || (folderUri.charAt(folderUri.length - 1) === "\\")) && (folderUri !== "/")){
                 folderUri = folderUri.substring(0, (folderUri.length - 1));
@@ -324,7 +328,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         writable:false,
         enumerable:true,
         value:function(uri){
-            uri = this.validateUri(uri);
+            uri = this.cleanupUri(uri);
             var arr = [];
             var temp = new String(uri);
             while(temp.indexOf("/") != -1){
@@ -532,8 +536,6 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             this.refreshButton.identifier = "refreshButton";
             this.backArrow.identifier = "backArrow";
             this.forwardArrow.identifier = "forwardArrow";
-            this.okButton.identifier = "okButton";
-            this.cancelButton.identifier = "cancelButton";
             this.iconView.identifier = "iconView";
             this.treeView.identifier = "treeView";
             this.resultsArea.identifier = "resultsArea";
@@ -622,6 +624,16 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
                         this.currentSelectedNode = evt.target;
 
                     }else{
+
+
+                        //test: highlight non-selectable icons too
+                        if(!evt.target.classList.contains("selected")){
+                            evt.target.classList.add("selected");
+                        }
+                        this.currentSelectedNode = evt.target;
+                        //end- test
+
+
                         //disable OK
                         if(!this.okButton.hasAttribute("disabled")){
                             this.okButton.setAttribute("disabled", "true");
@@ -651,7 +663,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
                     if(this.addressBarUri.value !== ""){
                         var uri = this.addressBarUri.value;
-                        uri = this.validateUri(uri);
+                        uri = this.cleanupUri(uri);
 
                         this.currentURI = uri;
                         var status = this.pickerViews()[this.selectedPickerView].call(this, uri);//dynamically calls the update function of the current picker view
@@ -676,7 +688,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
         value: function(evt){
                     if(evt.keyCode === 13 ){
                         var uri = this.addressBarUri.value;
-                        uri = this.validateUri(uri);
+                        uri = this.cleanupUri(uri);
 
                         this.currentURI = uri;
 
@@ -699,7 +711,7 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
     handleRefreshButtonClick:{
         value:function(evt){
                 var uri = this.addressBarUri.value;
-                uri = this.validateUri(uri);
+                uri = this.cleanupUri(uri);
 
                 var status = this.pickerViews()[this.selectedPickerView].call(this, uri, false);//dynamically calls the update function of the current picker view
 
@@ -768,22 +780,23 @@ var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
             }
     },
 
-    handleOkButtonClick : {
+    handleOkButtonAction : {
         value: function(evt){
-                    alert("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
+                    if(!!this.pickerModel.callback && !!this.pickerModel.callbackScope && (this.selectedItems.length > 0)){//call the callback if it is available
                         try{
-                            this.pickerModel.callback({"uri":this.selectedItems});
+                            this.pickerModel.callback.call(this.pickerModel.callbackScope, {"uri":this.selectedItems});
                         }catch(e){
                             success = false;
-                            console.log("[ERROR] File IO failed to open URIs:  "+ this.selectedItems.toString());
+                            console.log("[Error] Failed to open "+ this.selectedItems.toString());
+                            console.log(e.stack);
                         }
                     }else{//else send an event with the selected files
                         var pickerSelectionEvent = document.createEvent("Events");
                         pickerSelectionEvent.initEvent("pickerSelectionsDone", false, false);