diff options
author | Ananya Sen | 2012-03-30 16:31:18 -0700 |
---|---|---|
committer | Ananya Sen | 2012-03-30 16:31:18 -0700 |
commit | d4a682ddca0248e0dd7d8871dddbd167bd020a18 (patch) | |
tree | 673455ed0df96f8174a195c700b3e534bceed5d9 /js/io/ui | |
parent | 834086b91afc752745128a0c2be4730bf1c7858d (diff) | |
download | ninja-d4a682ddca0248e0dd7d8871dddbd167bd020a18.tar.gz |
- using clipboard data directly to avoid using setTimeout
- fixed logical error to trigger OK on Enter key pressed
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io/ui')
4 files changed, 13 insertions, 16 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 1ab268c5..46e8b386 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 | |||
@@ -66,10 +66,9 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
66 | 66 | ||
67 | handlePaste:{ | 67 | handlePaste:{ |
68 | value:function(evt){ | 68 | value:function(evt){ |
69 | var self=this; | 69 | evt.preventDefault(); |
70 | setTimeout(function(){ | 70 | evt.target.value = evt.clipboardData.getData("Text"); |
71 | self.handleNewFileDirectoryOnkeyup(evt); | 71 | this.handleNewFileDirectoryOnkeyup(evt); |
72 | }, 1); | ||
73 | } | 72 | } |
74 | }, | 73 | }, |
75 | 74 | ||
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 5dd1153d..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 | |||
@@ -31,10 +31,9 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, { | |||
31 | 31 | ||
32 | handlePaste:{ | 32 | handlePaste:{ |
33 | value:function(evt){ | 33 | value:function(evt){ |
34 | var self=this; | 34 | evt.preventDefault(); |
35 | setTimeout(function(){ | 35 | evt.target.value = evt.clipboardData.getData("Text"); |
36 | self.handleKeyup(evt); | 36 | this.handleKeyup(evt); |
37 | }, 1); | ||
38 | } | 37 | } |
39 | }, | 38 | }, |
40 | 39 | ||
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 | |||
326 | 326 | ||
327 | handleNewFileDirectorySet:{ | 327 | handleNewFileDirectorySet:{ |
328 | value:function(evt){ | 328 | value:function(evt){ |
329 | if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){ | 329 | if(evt.keyCode === 13){ |
330 | this.handleOkButtonAction(evt); | 330 | if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt); |
331 | }else if(evt.keyCode === 27){ | 331 | }else if(evt.keyCode === 27){ |
332 | this.handleCancelButtonAction(evt); | 332 | this.handleCancelButtonAction(evt); |
333 | } | 333 | } |
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 2bc141f7..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 | |||
@@ -85,8 +85,8 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { | |||
85 | 85 | ||
86 | handleNewFileDirectorySet:{ | 86 | handleNewFileDirectorySet:{ |
87 | value:function(evt){ | 87 | value:function(evt){ |
88 | if((evt.keyCode === 13) && !this.okButton.hasAttribute("disabled")){ | 88 | if(evt.keyCode === 13){ |
89 | this.handleOkButtonAction(evt); | 89 | if(!this.okButton.hasAttribute("disabled")) this.handleOkButtonAction(evt); |
90 | }else if(evt.keyCode === 27){ | 90 | }else if(evt.keyCode === 27){ |
91 | this.handleCancelButtonAction(evt); | 91 | this.handleCancelButtonAction(evt); |
92 | } | 92 | } |
@@ -101,10 +101,9 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, { | |||
101 | 101 | ||
102 | handlePaste:{ | 102 | handlePaste:{ |
103 | value:function(evt){ | 103 | value:function(evt){ |
104 | var self=this; | 104 | evt.preventDefault(); |
105 | setTimeout(function(){ | 105 | evt.target.value = evt.clipboardData.getData("Text"); |
106 | self.handleNewFileNameOnkeyup(evt); | 106 | this.handleNewFileNameOnkeyup(evt); |
107 | }, 1); | ||
108 | } | 107 | } |
109 | }, | 108 | }, |
110 | 109 | ||