Merge branch 'refs/heads/NINJAmaster' into TimelineUber

2 files changed, 12 insertions, 3 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 fac4c488..02579676 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
@@ -23,11 +23,20 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
             this.fileInputField.selectDirectory = true;
 
             this.newFileName.addEventListener("keyup", this, false);
-            this.newFileName.focus();
+            this.newFileName.addEventListener("paste", this, false);
+                        this.newFileName.focus();
             this.newFileName.select();
         }
     },
 
+    handlePaste:{
+        value:function(evt){
+            evt.preventDefault();
+            evt.target.value = evt.clipboardData.getData("Text");
+            this.handleKeyup(evt);
+        }
+    },
+
     handleKeyup:{
         value:function(evt){
             if(this.newFileName.value !== "") {
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 18556bc5..c98955ca 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
@@ -326,8 +326,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleNewFileDirectorySet:{
         value:function(evt){
-            if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){
-                this.handleOkButtonAction(evt);
+            if(evt.keyCode === 13){
+                if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt);
             }else if(evt.keyCode === 27){
                 this.handleCancelButtonAction(evt);
             }