Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste

Conflicts:
	js/controllers/styles-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

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, {
             this.findDirectory.identifier = "findDirectory";
             this.findDirectory.addEventListener("click", this, false);
             this.eventManager.addEventListener("pickerSelectionsDone", this.handleFileInputPickerSelectionsDone, false);
-            this.addEventListener("change@newFileDirectory.value", this.handleNewFileDirectoryChange, false);
+            this.addPropertyChangeListener("newFileDirectory.value", this.handleNewFileDirectoryChange, false);
             this.newFileDirectory.element.addEventListener("keyup", this, false);
         }
     },