1 files changed, 16 insertions, 16 deletions

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