Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping

1 files changed, 11 insertions, 2 deletions

diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index d59d5be1..c5ed8d33 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -55,6 +55,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
             this.fileInputField.newFileDirectory.value = this.folderUri;
 
             this.newFileName.addEventListener("keyup", function(evt){self.handleNewFileNameOnkeyup(evt);}, false);
+            this.newFileName.addEventListener("paste", this, false);
             this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
 
             this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);
@@ -84,8 +85,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
 
     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);
              }
@@ -98,6 +99,14 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
          }
      },
 
+    handlePaste:{
+        value:function(evt){
+            evt.preventDefault();
+            evt.target.value = evt.clipboardData.getData("Text");
+            this.handleNewFileNameOnkeyup(evt);
+        }
+    },
+
     handleNewFileNameOnkeyup:{
           value:function(evt){
               this.fileName = this.newFileName.value;