3 files changed, 50 insertions, 36 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 7340251c..1f9d9b9f 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -58,13 +58,20 @@
             }
         },
 
+        "newFileName": {
+            "prototype": "montage/ui/textfield.reel",
+            "properties": {
+                "element": {"#": "newFileName"}
+            }
+        },
+
         "owner":{
             "module": "js/io/ui/new-file-dialog/new-file-location.reel",
             "name": "NewFileLocation",
             "properties": {
                 "element": {"#": "newfileLocation"},
                 "fileInputField": {"@": "fileInputField"},
-                "newFileName": {"#": "newFileName"}
+                "newFileName": {"@": "newFileName"}
             }
         }
     }
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 3582f1a5..3ac38d02 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
@@ -22,23 +22,28 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
         value: function() {
             this.fileInputField.selectDirectory = true;
 
-            this.newFileName.addEventListener("keyup", this, false);
-            this.newFileName.addEventListener("paste", this, false);
-            this.newFileName.addEventListener("search", this, false);
-                        this.newFileName.focus();
-            this.newFileName.select();
+            this.addEventListener("change@newFileName.value", this.newFileNameChange, false);
+            this.newFileName.element.addEventListener("keyup", this, false);
+                        this.newFileName.element.focus();
+            this.newFileName.element.select();
         }
     },
 
-    handlePaste:{
-        value:function(evt){
-            evt.preventDefault();
-            evt.target.value = evt.clipboardData.getData("Text");
-            this.handleKeyup(evt);
+    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);
+            }
         }
     },
 
-    handleKeyup:{
+    newFileNameChange:{
         value:function(evt){
             var newFileNameSetEvent = document.createEvent("Events");
             newFileNameSetEvent.initEvent("newFileNameSet", false, false);
@@ -46,10 +51,5 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
             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 35c3b28e..552e8f6f 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
@@ -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{
-                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{
-                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);
             }
         }
     },