7 files changed, 129 insertions, 94 deletions

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 0f66468a..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,14 +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.newFileDirectory.addEventListener("paste", this, false);
-            this.newFileDirectory.addEventListener("search", this, false);
+            this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
+            this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false);
+            this.newFileDirectory.element.addEventListener("keyup", this, false);
         }
     },
 
@@ -65,15 +61,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
         }
     },
 
-    handlePaste:{
-        value:function(evt){
-            evt.preventDefault();
-            evt.target.value = evt.clipboardData.getData("Text");
-            this.handleNewFileDirectoryOnkeyup(evt);
-        }
-    },
-
-    handleNewFileDirectoryOnkeyup:{
+    handleNewFileDirectoryChange:{
           value:function(evt){
               var newFileDirectorySetEvent = document.createEvent("Events");
               newFileDirectorySetEvent.initEvent("newFileDirectorySet", false, false);
@@ -83,9 +71,18 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
           }
     },
 
-    handleSearch:{
-        value:function(evt){
-            this.handleNewFileDirectoryOnkeyup(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);
+            }
         }
     },
 
@@ -110,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.focus();
+                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/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){