diff options
| author | Jose Antonio Marquez | 2012-02-09 11:18:32 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-09 11:18:32 -0800 |
| commit | d7e198f5a95011679fa2c536780edbdc533a4893 (patch) | |
| tree | cf0f7b844d466cb7af96f4779ebee505b02bcda2 /js/io/ui/new-file-dialog/new-file-workflow-controller.js | |
| parent | ea6ec16e91740211a517db72f56108a033a521fe (diff) | |
| parent | c9d0cb73698066247c6267bba8fa446a979565fb (diff) | |
| download | ninja-d7e198f5a95011679fa2c536780edbdc533a4893.tar.gz | |
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
Conflicts:
js/io/system/fileio.js
js/mediators/io-mediator.js
Diffstat (limited to 'js/io/ui/new-file-dialog/new-file-workflow-controller.js')
| -rwxr-xr-x | js/io/ui/new-file-dialog/new-file-workflow-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
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 16075ecf..6cf2a2ae 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 = "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 | ||