5 files changed, 45 insertions, 41 deletions

diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index b0ffe2d8..ed7df972 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1085,7 +1085,7 @@ 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
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 46e8b386..0f66468a 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
@@ -21,6 +21,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
 
             this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false);
             this.newFileDirectory.addEventListener("paste", this, false);
+            this.newFileDirectory.addEventListener("search", this, false);
         }
     },
 
@@ -74,16 +75,20 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
 
     handleNewFileDirectoryOnkeyup:{
           value:function(evt){
-              if(this.newFileDirectory.value !== ""){
-                  var newFileDirectorySetEvent = document.createEvent("Events");
-                  newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
-                  newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
-                  newFileDirectorySetEvent.keyCode = evt.keyCode;
-                  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);
           }
     },
 
+    handleSearch:{
+        value:function(evt){
+            this.handleNewFileDirectoryOnkeyup(evt);
+        }
+    },
+
     handleFileInputPickerSelectionsDone:{
         value: function(evt){
             var selectedUri = "";
@@ -105,7 +110,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.focus();
                 var newFileDirectorySetEvent = document.createEvent("Events");
                   newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
                   newFileDirectorySetEvent.newFileDirectory = this.newFileDirectory.value;
diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
index 02579676..3582f1a5 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
@@ -24,6 +24,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
             this.newFileName.addEventListener("keyup", this, false);
             this.newFileName.addEventListener("paste", this, false);
+            this.newFileName.addEventListener("search", this, false);
                         this.newFileName.focus();
             this.newFileName.select();
         }
@@ -39,14 +40,16 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
 
     handleKeyup:{
         value:function(evt){
-            if(this.newFileName.value !== "") {
-                var newFileNameSetEvent = document.createEvent("Events");
-                newFileNameSetEvent.initEvent("newFileNameSet", false, false);
-                newFileNameSetEvent.newFileName = this.newFileName.value;
-                newFileNameSetEvent.keyCode = evt.keyCode;
-                this.eventManager.dispatchEvent(newFileNameSetEvent);
-            }
+            var newFileNameSetEvent = document.createEvent("Events");
+            newFileNameSetEvent.initEvent("newFileNameSet", false, false);
+            newFileNameSetEvent.newFileName = this.newFileName.value;
+            newFileNameSetEvent.keyCode = evt.keyCode;
+            this.eventManager.dispatchEvent(newFileNameSetEvent);
+        }
+    },
+    handleSearch:{
+       value:function(evt){
+            this.handleKeyup(evt);
         }
     }
-
 });
\ No newline at end of file
diff --git a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
index c98955ca..35c3b28e 100644
--- a/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
+++ b/js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js
@@ -30,12 +30,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     newFileName:{
         writable:true,
         enumerable:false,
-        value:""
+        value:null
     },
     newFileDirectory:{
         writable:true,
         enumerable:false,
-        value:""
+        value:null
     },
     templateWidth:{
         writable:true,
@@ -331,7 +331,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             }else if(evt.keyCode === 27){
                 this.handleCancelButtonAction(evt);
             }
-            else if(!!evt._event.newFileDirectory){
+            else{
                 this.newFileDirectory = evt._event.newFileDirectory;
                 if(this.isValidUri(this.newFileDirectory)){
                     this.enableOk();
@@ -347,7 +347,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
             }else if(evt.keyCode === 27){
                 this.handleCancelButtonAction(evt);
             }
-            else if(!!evt._event.newFileName){
+            else{
                 this.newFileName = evt._event.newFileName;
                 if(this.isValidFileName(this.newFileName)){
                     this.enableOk();
@@ -422,14 +422,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     isValidUri:{
         value: function(uri){
             var status= this.application.ninja.coreIoApi.isValidUri(uri);
-            if(uri !== ""){
-                if(!status){
+            if((uri !== null) && !status){
                     this.showError("! Invalid directory.");
                     //disable ok
                     if(!this.okButton.hasAttribute("disabled")){
                         this.okButton.setAttribute("disabled", "true");
                     }
-                }
             }
             return status;
         }
@@ -437,14 +435,12 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
     isValidFileName:{
         value: function(fileName){
             var status = this.validateFileName(fileName);
-            if(fileName !== ""){
-                if(!status){
+            if((fileName !== null ) && !status){
                     this.showError("! Invalid file name.");
                     //disable ok
                     if(!this.okButton.hasAttribute("disabled")){
                         this.okButton.setAttribute("disabled", "true");
                     }
-                }