aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/new-file-dialog
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-02-13 16:57:52 -0800
committerJose Antonio Marquez2012-02-13 16:57:52 -0800
commit79f7727ed077d054d791337d822c8e2259925084 (patch)
treef409fe261193dca124273b6ab1f6e9c06d3b3fe3 /js/io/ui/new-file-dialog
parent5b55cfe0bc333a9a18be6329fdc21b5a6652a15a (diff)
parentf3dc624fa464a79fd8e8cec1ddd16ed2109bda23 (diff)
downloadninja-79f7727ed077d054d791337d822c8e2259925084.tar.gz
Merge branch 'refs/heads/AnanyaFileIO' into FileIO
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.js5
1 files changed, 2 insertions, 3 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 f514b81a..848e0cb8 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
@@ -226,7 +226,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
226 226
227 if(!!this.selectedProjectType && !!this.selectedTemplate 227 if(!!this.selectedProjectType && !!this.selectedTemplate
228 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory) 228 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
229 && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType) 229 && !this.checkFileExists(projectName, projectDirectory, fileExtension)
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);
@@ -258,7 +258,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
258 this.popup.hide(); 258 this.popup.hide();
259 } 259 }
260 }else{ 260 }else{
261 if(this.error.innerHTML !== ""){ 261 if(this.error.innerHTML === ""){
262 this.showError("! Project Template, Name and Directory should be valid."); 262 this.showError("! Project Template, Name and Directory should be valid.");
263 } 263 }
264 //disable ok 264 //disable ok
@@ -328,7 +328,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
328 328
329 if(!!this.selectedProjectType && !!this.selectedTemplate 329 if(!!this.selectedProjectType && !!this.selectedTemplate
330 && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory) 330 && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory)
331 && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.newFileModel.projectTypeData[this.selectedProjectType.uri].fileExtension)
332 ){ 331 ){
333 status = true; 332 status = true;
334 this.okButton.removeAttribute("disabled"); 333 this.okButton.removeAttribute("disabled");