diff options
author | Jose Antonio Marquez Russo | 2012-02-10 11:12:25 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-02-10 11:12:25 -0800 |
commit | 13b98b96ab36da5029204aa2a35d0d646d471274 (patch) | |
tree | 477ee2ae9ff0c81f269da4b34e03f2983f1edae1 /js/io/ui/new-file-dialog | |
parent | fbe830fabe497d01f4f2eaddb867161a8187c101 (diff) | |
parent | 8c40940f030adb74f534c3c5ad8d845e41f09b30 (diff) | |
download | ninja-13b98b96ab36da5029204aa2a35d0d646d471274.tar.gz |
Merge pull request #6 from ananyasen/FileIO
Open file fixes and adding opening in code view.
Diffstat (limited to 'js/io/ui/new-file-dialog')
-rw-r--r-- | js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js | 8 | ||||
-rwxr-xr-x | js/io/ui/new-file-dialog/new-file-workflow-controller.js | 2 |
2 files changed, 5 insertions, 5 deletions
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 bcb9d123..f514b81a 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 | |||
@@ -230,10 +230,10 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C | |||
230 | ){ | 230 | ){ |
231 | this.error.innerHTML=""; | 231 | this.error.innerHTML=""; |
232 | //console.log("$$$ new file selections: \n" + selectionlog); | 232 | //console.log("$$$ new file selections: \n" + selectionlog); |
233 | if(!!this.newFileModel.callback && !!this.newFileModel.callbackScope){//inform document-controller if save successful | 233 | if(!!this.newFileModel.callback){//inform document-controller if save successful |
234 | this.newFileModel.callback.call(this.newFileModel.callbackScope, {"fileTemplateUri":selectedProjectTypeID, | 234 | this.newFileModel.callback({"fileTemplateUri":selectedProjectTypeID, |
235 | "newFilePath":newFilePath, | 235 | "newFilePath":newFilePath, |
236 | "fileExtension":fileExtension});//document-controller api | 236 | "fileExtension":fileExtension});//document-controller api |
237 | }else{ | 237 | }else{ |
238 | //send selection event | 238 | //send selection event |
239 | var newFileSelectionEvent = document.createEvent("Events"); | 239 | var newFileSelectionEvent = document.createEvent("Events"); |
diff --git a/js/io/ui/new-file-dialog/new-file-workflow-controller.js b/js/io/ui/new-file-dialog/new-file-workflow-controller.js index 6cf2a2ae..7b7f4572 100755 --- a/js/io/ui/new-file-dialog/new-file-workflow-controller.js +++ b/js/io/ui/new-file-dialog/new-file-workflow-controller.js | |||
@@ -44,7 +44,7 @@ var NewFileWorkflowController = exports.NewFileWorkflowController = Montage.cre | |||
44 | this.model.projectTypeData = this.loadDescriptor("js/io/templates/descriptor.json"); | 44 | this.model.projectTypeData = this.loadDescriptor("js/io/templates/descriptor.json"); |
45 | 45 | ||
46 | //get default project type | 46 | //get default project type |
47 | this.model.defaultProjectType = "/js/io/templates/files/html.txt"; | 47 | this.model.defaultProjectType = "js/io/templates/files/html.txt"; |
48 | this.model.callback = data.callback || null; | 48 | this.model.callback = data.callback || null; |
49 | this.model.callbackScope = data.callbackScope || null; | 49 | this.model.callbackScope = data.callbackScope || null; |
50 | 50 | ||