12 files changed, 275 insertions, 112 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f428a229..a06f45c6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -217,7 +217,7 @@ exports.CoreIoApi = Montage.create(Component, {
         value: function(serviceURL, path) {
             var urlOut = path.replace(/\\/g,"/");
             urlOut = urlOut.replace(/:/g,"");
-            urlOut = encodeURI(urlOut);
+            urlOut = encodeURIComponent(urlOut);
             //add leading / if not already there
             if((urlOut.length > 0) && (urlOut.charAt(0) !== "/")){
                 urlOut = "/" + urlOut;
@@ -393,12 +393,12 @@ exports.CoreIoApi = Montage.create(Component, {
                         xhr = new XMLHttpRequest();
                     //
                     xhr.open("POST", serviceURL, false);
-                    xhr.responseType = "arraybuffer"; 
+                    //xhr.responseType = "arraybuffer"; 
                     if(file.contentType && file.contentType.length)
                         xhr.setRequestHeader("Content-Type", file.contentType);
                     else
                         xhr.setRequestHeader("Content-Type", "text/plain");
-
+                    
                     if (file.contents)
                         xhr.send(file.contents);
                     else
@@ -1085,14 +1085,14 @@ exports.CoreIoApi = Montage.create(Component, {
     isValidUri:{
         value: function(uri){
             var isWindowsUri=false, isUnixUri=false,status=false;
-            if(uri !== ""){
+            if((uri !== null) && (uri !== "")){
                 uri = uri.replace(/^\s+|\s+$/g,"");  // strip any leading or trailing spaces
 
                 //for local machine folder uri
                 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri);
                 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
                 status = isWindowsUri || isUnixUri;
-                if(isWindowsUri && isUnixUri){status = false;}
+                if((uri === "") || (isWindowsUri && isUnixUri)){status = false;}
             }
             return status;
         }
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index 00ee7ed2..285444b5 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
-                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.6.0.0"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.1.0"}
+                {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.7.0.0"},
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.5.4.0"}
         ]
 }
\ No newline at end of file
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
index 2fcaa075..00df1c11 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.html
@@ -10,13 +10,21 @@
     <link rel="stylesheet" type="text/css" href="file-input-field.css">
     <script type="text/montage-serialization">
     {
+
+        "newFileDirectory": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileDirectory"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/file-picker/file-input-field.reel",
             "name": "FileInputField",
             "properties": {
                 "element": {"#": "fileInputField"},
                 "findDirectory": {"#": "findDirectory"},
-                "newFileDirectory": {"#": "newFileDirectory"}
+                "newFileDirectory": {"@": "newFileDirectory"}
             }
         }
     }
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index 651fd7fa..9e77759f 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -14,12 +14,10 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
         value: function() {
             var that = this;
             this.findDirectory.identifier = "findDirectory";
-
             this.findDirectory.addEventListener("click", this, false);
-
-            this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false);
-
-            this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false);
+            this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
+            this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false);
+            this.newFileDirectory.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -63,17 +61,31 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
         }
     },
 
-    handleNewFileDirectoryOnkeyup:{
+    handleNewFileDirectoryChange:{
           value:function(evt){
-              if(this.newFileDirectory.value !== ""){
-                  var newFileDirectorySetEvent = document.createEvent("Events");
-                  newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
-                  newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
-                  this.eventManager.dispatchEvent(newFileDirectorySetEvent);
-              }
+              var newFileDirectorySetEvent = document.createEvent("Events");
+              newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
+              newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
+              newFileDirectorySetEvent.keyCode = evt.keyCode;
+              this.eventManager.dispatchEvent(newFileDirectorySetEvent);
           }
     },
 
+
+    handleKeyup:{
+        value: function(evt){
+            if(evt.keyCode === 13){
+                var enterKeyupEvent = document.createEvent("Events");
+                enterKeyupEvent.initEvent("enterKey", false, false);
+                this.eventManager.dispatchEvent(enterKeyupEvent);
+            }else if(evt.keyCode === 27){
+                var escKeyupEvent = document.createEvent("Events");
+                escKeyupEvent.initEvent("escKey", false, false);
+                this.eventManager.dispatchEvent(escKeyupEvent);
+            }
+        }
+    },
+
     handleFileInputPickerSelectionsDone:{
         value: function(evt){
             var selectedUri = "";
@@ -95,7 +107,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
             if(!!obj && obj.uri && obj.uri.length > 0){
                 selectedUri = obj.uri[0];
                 this.newFileDirectory.value = selectedUri;
-
+                this.newFileDirectory.element.focus();
                 var newFileDirectorySetEvent = document.createEvent("Events");
                   newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
                   newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
diff --git a/js/io/ui/file-picker/file-picker-controller.js b/js/io/ui/file-picker/file-picker-controller.js
index 105dc223..436a50f3 100755
--- a/js/io/ui/file-picker/file-picker-controller.js
+++ b/js/io/ui/file-picker/file-picker-controller.js
@@ -23,6 +23,11 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
         }
     },
 
+    pickerNavChoices:{
+        enumerable: true,
+        value: null
+    },
+
     filePickerPopupType:{
         enumerable: false,
         value: "filePicker"
@@ -125,8 +130,6 @@ var FilePickerController = exports.FilePickerController = Montage.create(require
             }
 
             if(!!storedUri){
-                // This is depracated -- use decodeURI instead
-                //aModel.currentRoot = unescape(storedUri);