Merge branch 'refs/heads/ninja-internal' into AllFixes

1 files changed, 32 insertions, 28 deletions

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..1a26c99c 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,
@@ -145,6 +145,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 }
             }, true);
 
+            this.eventManager.addEventListener("enterKey", this, false);
+            this.eventManager.addEventListener("escKey", this, false);
+
         }
 
     },
@@ -326,32 +329,36 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleNewFileDirectorySet:{
         value:function(evt){
-            if(evt.keyCode === 13){
-                if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt);
-            }else if(evt.keyCode === 27){
-                this.handleCancelButtonAction(evt);
-            }
-            else if(!!evt._event.newFileDirectory){
-                this.newFileDirectory = evt._event.newFileDirectory;
-                if(this.isValidUri(this.newFileDirectory)){
-                    this.enableOk();
-                }
+            this.newFileDirectory = evt._event.newFileDirectory;
+            if(this.isValidUri(this.newFileDirectory)){
+                this.enableOk();
             }
         }
     },
 
     handleNewFileNameSet:{
         value:function(evt){
-            if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
-                this.handleOkButtonAction(evt);
-            }else if(evt.keyCode === 27){
-                this.handleCancelButtonAction(evt);
+            this.newFileName = evt._event.newFileName;
+            if(this.isValidFileName(this.newFileName)){
+                this.enableOk();
             }
-            else if(!!evt._event.newFileName){
-                this.newFileName = evt._event.newFileName;
-                if(this.isValidFileName(this.newFileName)){
-                    this.enableOk();
-                }
+        }
+    },
+
+    handleEnterKey:{
+        value: function(evt){
+            if((this.application.ninja.newFileController.newFileOptionsNav !== null)
+                  && !this.okButton.hasAttribute("disabled")){
+
+                    this.handleOkButtonAction(evt);
+              }
+        }
+    },
+
+    handleEscKey:{
+        value: function(evt){
+            if(this.application.ninja.newFileController.newFileOptionsNav !== null){
+                this.handleCancelButtonAction(evt);
             }
         }
     },
@@ -422,14 +429,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 +442,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");
                     }
-                }
             }
             return status;
         }
@@ -488,8 +491,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         validateFileName:{
             value: function(fileName){
                 var status = false;
-                if(fileName !== ""){
+                if((fileName !== null) && (fileName !== "")){
                     fileName = fileName.replace(/^\s+|\s+$/g,"");
+                    if(fileName === ""){return false;}
                     status = !(/[/\\]/g.test(fileName));
                     if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
                         status = !(/^\./g.test(fileName));