aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
diff options
context:
space:
mode:
authorPushkar Joshi2012-04-17 14:49:18 -0700
committerPushkar Joshi2012-04-17 14:49:18 -0700
commitdf903a01e14134cadf109b733d09c6eadfa3966b (patch)
tree2351f1c05b2f852053fa0be533072088a9ad4e7c /js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js
parent036cf034e124dbc1f4893e90f7c6d240904a3faf (diff)
parentcacb4a21825818af392c2949967b0f3c1df509c5 (diff)
downloadninja-df903a01e14134cadf109b733d09c6eadfa3966b.tar.gz
Merge branch 'master' into pentool
Conflicts: js/tools/PenTool.js
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js32
1 files changed, 16 insertions, 16 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 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, {
22 value: function() { 22 value: function() {
23 this.fileInputField.selectDirectory = true; 23 this.fileInputField.selectDirectory = true;
24 24
25 this.newFileName.addEventListener("keyup", this, false); 25 this.addEventListener("change@newFileName.value", this.newFileNameChange, false);
26 this.newFileName.addEventListener("paste", this, false); 26 this.newFileName.element.addEventListener("keyup", this, false);
27 this.newFileName.addEventListener("search", this, false); 27 this.newFileName.element.focus();
28 this.newFileName.focus(); 28 this.newFileName.element.select();
29 this.newFileName.select();
30 } 29 }
31 }, 30 },
32 31
33 handlePaste:{ 32 handleKeyup:{
34 value:function(evt){ 33 value: function(evt){
35 evt.preventDefault(); 34 if(evt.keyCode === 13){
36 evt.target.value = evt.clipboardData.getData("Text"); 35 var enterKeyupEvent = document.createEvent("Events");
37 this.handleKeyup(evt); 36 enterKeyupEvent.initEvent("enterKey", false, false);
37 this.eventManager.dispatchEvent(enterKeyupEvent);
38 }else if(evt.keyCode === 27){
39 var escKeyupEvent = document.createEvent("Events");
40 escKeyupEvent.initEvent("escKey", false, false);
41 this.eventManager.dispatchEvent(escKeyupEvent);
42 }
38 } 43 }
39 }, 44 },
40 45
41 handleKeyup:{ 46 newFileNameChange:{
42 value:function(evt){ 47 value:function(evt){
43 var newFileNameSetEvent = document.createEvent("Events"); 48 var newFileNameSetEvent = document.createEvent("Events");
44 newFileNameSetEvent.initEvent("newFileNameSet", false, false); 49 newFileNameSetEvent.initEvent("newFileNameSet", false, false);
@@ -46,10 +51,5 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
46 newFileNameSetEvent.keyCode = evt.keyCode; 51 newFileNameSetEvent.keyCode = evt.keyCode;
47 this.eventManager.dispatchEvent(newFileNameSetEvent); 52 this.eventManager.dispatchEvent(newFileNameSetEvent);
48 } 53 }
49 },
50 handleSearch:{
51 value:function(evt){
52 this.handleKeyup(evt);
53 }
54 } 54 }
55}); \ No newline at end of file 55}); \ No newline at end of file