aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-09 11:18:32 -0800
committerJose Antonio Marquez2012-02-09 11:18:32 -0800
commitd7e198f5a95011679fa2c536780edbdc533a4893 (patch)
treecf0f7b844d466cb7af96f4779ebee505b02bcda2 /js/components
parentea6ec16e91740211a517db72f56108a033a521fe (diff)
parentc9d0cb73698066247c6267bba8fa446a979565fb (diff)
downloadninja-d7e198f5a95011679fa2c536780edbdc533a4893.tar.gz
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/ui/FilePicker/file-input-field.reel/file-input-field.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js b/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js
index f832e618..8710de63 100755
--- a/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js
+++ b/js/components/ui/FilePicker/file-input-field.reel/file-input-field.js
@@ -30,7 +30,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
30 30
31 this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false); 31 this.eventManager.addEventListener("pickerSelectionsDone", function(evt){that.handleFileInputPickerSelectionsDone(evt);}, false);
32 32
33 this.newFileDirectory.addEventListener("blur", function(evt){that.handleNewFileDirectoryOnblur(evt);}, false); 33 this.newFileDirectory.addEventListener("keyup", function(evt){that.handleNewFileDirectoryOnkeyup(evt);}, false);
34 } 34 }
35 }, 35 },
36 36
@@ -77,7 +77,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, {
77 } 77 }
78 }, 78 },
79 79
80 handleNewFileDirectoryOnblur:{ 80 handleNewFileDirectoryOnkeyup:{
81 value:function(evt){ 81 value:function(evt){
82 if(this.newFileDirectory.value !== ""){ 82 if(this.newFileDirectory.value !== ""){
83 var newFileDirectorySetEvent = document.createEvent("Events"); 83 var newFileDirectorySetEvent = document.createEvent("Events");