Merge branch 'refs/heads/AnanyaFileIO' into FileIO

2 files changed, 4 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 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
 
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(projectName) && this.isValidUri(projectDirectory)
-                && !this.checkFileExists(projectName, projectDirectory, this.selectedProjectType)
+                && !this.checkFileExists(projectName, projectDirectory, fileExtension)
             ){
                 this.error.innerHTML="";
                 //console.log("$$$ new file selections: \n" + selectionlog);
@@ -258,7 +258,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
                     this.popup.hide();
                 }
             }else{
-                if(this.error.innerHTML !== ""){
+                if(this.error.innerHTML === ""){
                     this.showError("! Project Template, Name and Directory should be valid.");
                 }
                 //disable ok
@@ -328,7 +328,6 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
 
             if(!!this.selectedProjectType && !!this.selectedTemplate
                 && this.isValidFileName(this.newFileName) && this.isValidUri(this.newFileDirectory)
-                && !this.checkFileExists(this.newFileName, this.newFileDirectory, this.newFileModel.projectTypeData[this.selectedProjectType.uri].fileExtension)
                 ){
                 status = true;
                 this.okButton.removeAttribute("disabled");
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.js b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
index 4546e124..786ef5c9 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.js
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.js
@@ -89,7 +89,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
 
     enableOk:{
         value: function(){
-            if(this.isValidFileName(this.fileName) && this.isValidUri(this.folderUri) && !this.checkFileExists(this.fileName, this.folderUri)){
+            if(this.isValidFileName(this.fileName) && this.isValidUri(this.folderUri)){
                 this.okButton.removeAttribute("disabled");
                 this.error.innerHTML="";
             }
@@ -141,7 +141,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
                     }
                 }
             }else{
-                if(this.error.innerHTML !== ""){
+                if(this.error.innerHTML === ""){
                     this.showError("! Name and Location should be valid.");
                 }
                 //disable ok