Merge branch 'refs/heads/NinjaInternal' into Color

2 files changed, 20 insertions, 3 deletions

diff --git a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
index 8c0327eb..7340251c 100755
--- a/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
+++ b/js/io/ui/new-file-dialog/new-file-location.reel/new-file-location.html
@@ -51,7 +51,7 @@
         },
 
         "fileInputField":{
-            "module": "js/components/ui/FilePicker/file-input-field.reel",
+            "module": "js/io/ui/file-picker/file-input-field.reel",
             "name": "FileInputField",
             "properties": {
                 "element": {"#": "fileInputField"}
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 f5ab0027..11b322fe 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
@@ -386,8 +386,25 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
         }
     },
     checkFileExists:{
-        value: function(fileUri, folderUri, fileType){
-            var status= this.application.ninja.coreIoApi.checkFileExists(fileUri, folderUri, fileType);
+        value: function(fileName, folderUri, fileType){
+            var uri = "", response=null, status=true;
+            //prepare absolute uri
+            if(/[^/\\]$/g.test(folderUri)){
+                folderUri = folderUri + "/";
+            }
+            if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
+                fileName = fileName+fileType;
+            }
+            uri = ""+folderUri+fileName;
+            response= this.application.ninja.coreIoApi.fileExists({"uri":uri});
+            if(!!response && response.success && (response.status === 204)){
+                status = true;
+            }else if(!!response && response.success && (response.status === 404)){
+                status = false;
+            }else{
+                status = false;
+            }
+
             if(status){
                 this.showError("! File already exists.");
             }