diff options
author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
tree | c5b17297aba04bd54a59cf6214d29486e089031b /js/io/ui/new-file-dialog | |
parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rwxr-xr-x | js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js | 2 | ||||
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 11 |
2 files changed, 9 insertions, 4 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 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, { | |||
22 | value: function() { | 22 | value: function() { |
23 | this.fileInputField.selectDirectory = true; | 23 | this.fileInputField.selectDirectory = true; |
24 | 24 | ||
25 | this.addEventListener("change@newFileName.value", this.newFileNameChange, false); | 25 | this.addPropertyChangeListener("newFileName.value", this.newFileNameChange, false); |
26 | this.newFileName.element.addEventListener("keyup", this, false); | 26 | this.newFileName.element.addEventListener("keyup", this, false); |
27 | this.newFileName.element.focus(); | 27 | this.newFileName.element.focus(); |
28 | this.newFileName.element.select(); | 28 | 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 | |||
249 | 249 | ||
250 | handleOkButtonAction:{ | 250 | handleOkButtonAction:{ |
251 | value: function(evt){ | 251 | value: function(evt){ |
252 | var selectedProjectTypeID = this.selectedProjectType.uri, | 252 | var templateData, |
253 | selectedProjectTypeID = this.selectedProjectType.uri, | ||
253 | templateID = this.selectedTemplate.uri, | 254 | templateID = this.selectedTemplate.uri, |
254 | projectName = this.newFileLocation.newFileName.value, | 255 | projectName = this.newFileLocation.newFileName.value, |
255 | projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, | 256 | projectDirectory = this.newFileLocation.fileInputField.newFileDirectory.value, |
@@ -264,7 +265,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
264 | "projectDirectory="+projectDirectory+"\n"+ | 265 | "projectDirectory="+projectDirectory+"\n"+ |
265 | "projectWidth="+projectWidth+"\n"+ | 266 | "projectWidth="+projectWidth+"\n"+ |
266 | "projectHeight="+projectHeight; | 267 | "projectHeight="+projectHeight; |
267 | 268 | //////////////////////////////////////////////////////////////////// | |
269 | //Template data must be passed during file creation (lots of confusion data here, should be cleaned up…) | ||
270 | templateData = {id: templateID, name: this.newFileModel.projectTypeData[selectedProjectTypeID].name, type: this.newFileModel.projectTypeData[selectedProjectTypeID].type}; | ||
271 | //////////////////////////////////////////////////////////////////// | ||
268 | 272 | ||
269 | if(/[^/\\]$/g.test(projectDirectory)){ | 273 | if(/[^/\\]$/g.test(projectDirectory)){ |
270 | projectDirectory = projectDirectory + "/"; | 274 | projectDirectory = projectDirectory + "/"; |
@@ -285,7 +289,8 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
285 | if(!!this.newFileModel.callback){//inform document-controller if save successful | 289 | if(!!this.newFileModel.callback){//inform document-controller if save successful |
286 | this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID, | 290 | this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID, |
287 | "newFilePath":newFilePath, | 291 | "newFilePath":newFilePath, |
288 | "fileExtension":fileExtension});//document-controller api | 292 | "fileExtension":fileExtension, |
293 | "template":templateData});//document-controller api | ||
289 | }else{ | 294 | }else{ |
290 | //send selection event | 295 | //send selection event |
291 | var newFileSelectionEvent = document.createEvent("Events"); | 296 | var newFileSelectionEvent = document.createEvent("Events"); |