diff options
author | hwc487 | 2012-05-31 17:11:08 -0700 |
---|---|---|
committer | hwc487 | 2012-05-31 17:11:08 -0700 |
commit | 1c445cf5d905f79937998cf2f1115594ea8c1074 (patch) | |
tree | 35271ad7ffec86fde9102af3dd954fa3a2974582 /js/io/ui/file-picker/file-input-field.reel | |
parent | 335ce503996e3ccbd2909086328d0a31fbd03370 (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-1c445cf5d905f79937998cf2f1115594ea8c1074.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/io/system/ninjalibrary.json
Diffstat (limited to 'js/io/ui/file-picker/file-input-field.reel')
-rwxr-xr-x | js/io/ui/file-picker/file-input-field.reel/file-input-field.js | 2 |
1 files changed, 1 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 9e77759f..a5fab11c 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 | |||
@@ -16,7 +16,7 @@ var FileInputField = exports.FileInputField = Montage.create(Component, { | |||
16 | this.findDirectory.identifier = "findDirectory"; | 16 | this.findDirectory.identifier = "findDirectory"; |
17 | this.findDirectory.addEventListener("click", this, false); | 17 | this.findDirectory.addEventListener("click", this, false); |
18 | this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); | 18 | this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false); |
19 | this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false); | 19 | this.addPropertyChangeListener("newFileDirectory.value", this.handleNewFileDirectoryChange, false); |
20 | this.newFileDirectory.element.addEventListener("keyup", this, false); | 20 | this.newFileDirectory.element.addEventListener("keyup", this, false); |
21 | } | 21 | } |
22 | }, | 22 | }, |