aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-03-28 14:02:57 -0700
committerAnanya Sen2012-03-28 14:02:57 -0700
commit834086b91afc752745128a0c2be4730bf1c7858d (patch)
tree1dfff28493c115a52479d6ca52705f8a35ddc313 /js
parent4c2948447482fe57110e7fd674e362bbbd5814b6 (diff)
downloadninja-834086b91afc752745128a0c2be4730bf1c7858d.tar.gz
detect paste from context menu for new file and save as dialog
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/io/ui/file-picker/file-input-field.reel/file-input-field.js10
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js12
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js10
3 files changed, 31 insertions, 1 deletions
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 ccb925b9..1ab268c5 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
@@ -20,6 +20,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
20 this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false); 20 this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false);
21 21
22 this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false); 22 this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false);
23 this.newFileDirectory.addEventListener("paste", this, false);
23 } 24 }
24 }, 25 },
25 26
@@ -63,6 +64,15 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
63 } 64 }
64 }, 65 },
65 66
67 handlePaste:{
68 value:function(evt){
69 var self=this;
70 setTimeout(function(){
71 self.handleNewFileDirectoryOnkeyup(evt);
72 }, 1);
73 }
74 },
75
66 handleNewFileDirectoryOnkeyup:{ 76 handleNewFileDirectoryOnkeyup:{
67 value:function(evt){ 77 value:function(evt){
68 if(this.newFileDirectory.value !== ""){ 78 if(this.newFileDirectory.value !== ""){
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..5dd1153d 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,21 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
23 this.fileInputField.selectDirectory = true; 23 this.fileInputField.selectDirectory = true;
24 24
25 this.newFileName.addEventListener("keyup", this, false); 25 this.newFileName.addEventListener("keyup", this, false);
26 this.newFileName.focus(); 26 this.newFileName.addEventListener("paste", this, false);
27 this.newFileName.focus();
27 this.newFileName.select(); 28 this.newFileName.select();
28 } 29 }
29 }, 30 },
30 31
32 handlePaste:{
33 value:function(evt){
34 var self=this;
35 setTimeout(function(){
36 self.handleKeyup(evt);
37 }, 1);
38 }
39 },
40
31 handleKeyup:{ 41 handleKeyup:{
32 value:function(evt){ 42 value:function(evt){
33 if(this.newFileName.value !== "") { 43 if(this.newFileName.value !== "") {
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..2bc141f7 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, {
55 this.fileInputField.newFileDirectory.value = this.folderUri; 55 this.fileInputField.newFileDirectory.value = this.folderUri;
56 56
57 this.newFileName.addEventListener("keyup", function(evt){self.handleNewFileNameOnkeyup(evt);}, false); 57 this.newFileName.addEventListener("keyup", function(evt){self.handleNewFileNameOnkeyup(evt);}, false);
58 this.newFileName.addEventListener("paste", this, false);
58 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false); 59 this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
59 60
60 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false); 61 this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);
@@ -98,6 +99,15 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
98 } 99 }
99 }, 100 },
100 101
102 handlePaste:{
103 value:function(evt){
104 var self=this;
105 setTimeout(function(){
106 self.handleNewFileNameOnkeyup(evt);
107 }, 1);
108 }
109 },
110
101 handleNewFileNameOnkeyup:{ 111 handleNewFileNameOnkeyup:{
102 value:function(evt){ 112 value:function(evt){
103 this.fileName = this.newFileName.value; 113 this.fileName = this.newFileName.value;