Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/panels/Timeline/Layer.reel/Layer.js
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/properties.reel/properties.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

4 files changed, 11 insertions, 6 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);
         }
     },
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 3ac38d02..e8a699cc 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,7 +22,7 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
         value: function() {
             this.fileInputField.selectDirectory = true;
 
-            this.addEventListener("change@newFileName.value", this.newFileNameChange, false);
+            this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false);
             this.newFileName.element.addEventListener("keyup", this, false);
                         this.newFileName.element.focus();
             this.newFileName.element.select();
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 1a26c99c..ebe2df61 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
@@ -249,7 +249,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
     handleOkButtonAction:{
         value: function(evt){
-            var selectedProjectTypeID = this.selectedProjectType.uri,
+            var templateData,
+                selectedProjectTypeID = this.selectedProjectType.uri,
                 templateID = this.selectedTemplate.uri,
                 projectName = this.newFileLocation.newFileName.value,
                 projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value,
@@ -264,7 +265,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                             "projectDirectory="+projectDirectory+"\n"+
                             "projectWidth="+projectWidth+"\n"+
                             "projectHeight="+projectHeight;
-
+                ////////////////////////////////////////////////////////////////////           
+                //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…)
+                templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type};
+                ////////////////////////////////////////////////////////////////////
 
             if(/[^/\\]$/g.test(projectDirectory)){
                 projectDirectory = projectDirectory + "/";
@@ -285,7 +289,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                 if(!!this.newFileModel.callback){//inform document-controller if save successful
                     this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID,
                                                  "newFilePath":newFilePath,
-                                                  "fileExtension":fileExtension});//document-controller api
+                                                  "fileExtension":fileExtension,
+                                                   "template":templateData});//document-controller api
                 }else{
                     //send selection event
                     var newFileSelectionEvent = document.createEvent("Events");
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 e2f50ff5..a27d9d13 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
@@ -57,7 +57,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
             this.fileInputField.selectDirectory = true;
             this.fileInputField.pickerName = "saveAsDirectoryPicker";
 
-            this.addEventListener("change@newFileName.value", this.handleNewFileNameChange, false);
+            this.addPropertyChangeListener("newFileName.value", this.handleNewFileNameChange, false);
             this.newFileName.element.addEventListener("keyup", this, false);
             this.eventManager.addEventListener("newFileDirectorySet", function(evt){self.handleNewFileDirectorySet(evt);}, false);
             this.okButton.addEventListener("click", function(evt){self.handleOkButtonAction(evt);}, false);