aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-09 11:18:32 -0800
committerJose Antonio Marquez2012-02-09 11:18:32 -0800
commitd7e198f5a95011679fa2c536780edbdc533a4893 (patch)
treecf0f7b844d466cb7af96f4779ebee505b02bcda2 /js/io/ui/new-file-dialog
parentea6ec16e91740211a517db72f56108a033a521fe (diff)
parentc9d0cb73698066247c6267bba8fa446a979565fb (diff)
downloadninja-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')
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-location.reel/new-file-location.js4
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js9
-rwxr-xr-xjs/io/ui/new-file-dialog/new-file-workflow-controller.js2
3 files changed, 8 insertions, 7 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 7da13dfc..fae8f9c7 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
@@ -37,12 +37,12 @@ var NewFileLocation = exports.NewFileLocation = Montage.create(Component, {
37 37
38 this.fileInputField.selectDirectory = true; 38 this.fileInputField.selectDirectory = true;
39 39
40 this.newFileName.addEventListener("blur", function(evt){that.handleNewFileNameOnblur(evt);}, false); 40 this.newFileName.addEventListener("keyup", function(evt){that.handleNewFileNameOnkeyup(evt);}, false);
41 } 41 }
42 42
43 }, 43 },
44 44
45 handleNewFileNameOnblur:{ 45 handleNewFileNameOnkeyup:{
46 value:function(evt){ 46 value:function(evt){
47 if(this.newFileName.value !== ""){ 47 if(this.newFileName.value !== ""){
48 var newFileNameSetEvent = document.createEvent("Events"); 48 var newFileNameSetEvent = document.createEvent("Events");
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 2f148621..bcb9d123 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
@@ -217,8 +217,9 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
217 if(/[^/\\]$/g.test(projectDirectory)){ 217 if(/[^/\\]$/g.test(projectDirectory)){
218 projectDirectory = projectDirectory + "/"; 218 projectDirectory = projectDirectory + "/";
219 } 219 }
220 if(!!fileExtension && (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length))){ 220
221 projectName = projectName+fileExtension; 221 if(!!fileExtension && ((projectName.lastIndexOf(fileExtension) === -1) || (projectName.lastIndexOf(fileExtension) !== (projectName.length - fileExtension.length)))){
222 projectName = projectName+fileExtension;//append file extension if file extension is already not present or is actually part of the file name
222 } 223 }
223 newFilePath = "" + projectDirectory + projectName; 224 newFilePath = "" + projectDirectory + projectName;
224 225
@@ -367,7 +368,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
367 }, 368 },
368 isValidFileName:{ 369 isValidFileName:{
369 value: function(fileName){ 370 value: function(fileName){
370 var status = this.isValidFileName(fileName); 371 var status = this.validateFileName(fileName);
371 if(fileName !== ""){ 372 if(fileName !== ""){
372 if(!status){ 373 if(!status){
373 this.showError("! Invalid file name."); 374 this.showError("! Invalid file name.");
@@ -399,7 +400,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
399 /*** 400 /***
400 * file name validation 401 * file name validation
401 */ 402 */
402 isValidFileName:{ 403 validateFileName:{
403 value: function(fileName){ 404 value: function(fileName){
404 var status = false; 405 var status = false;
405 if(fileName !== ""){ 406 if(fileName !== ""){
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