aboutsummaryrefslogtreecommitdiff
path: root/js/io/ui/save-as-dialog.reel
diff options
context:
space:
mode:
authorhwc4872012-02-22 10:58:40 -0800
committerhwc4872012-02-22 10:58:40 -0800
commit1a72686c9b915c488f9b430995787d2176671561 (patch)
tree849ca3d54f68c6c327c3daa240b48c7be6f73e91 /js/io/ui/save-as-dialog.reel
parentbb441ec8f8080cdaa52257a40531c62c47028667 (diff)
parent2f24dafec79583547fe663d5a387d8ef15aae3bf (diff)
downloadninja-1a72686c9b915c488f9b430995787d2176671561.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration
Diffstat (limited to 'js/io/ui/save-as-dialog.reel')
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.html2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js21
2 files changed, 20 insertions, 3 deletions
diff --git a/js/io/ui/save-as-dialog.reel/save-as-dialog.html b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
index 4f0d5779..374e3d48 100644
--- a/js/io/ui/save-as-dialog.reel/save-as-dialog.html
+++ b/js/io/ui/save-as-dialog.reel/save-as-dialog.html
@@ -11,7 +11,7 @@
11 <script type="text/montage-serialization"> 11 <script type="text/montage-serialization">
12 { 12 {
13 "fileInputField":{ 13 "fileInputField":{
14 "module": "js/components/ui/FilePicker/file-input-field.reel", 14 "module": "js/io/ui/file-picker/file-input-field.reel",
15 "name": "FileInputField", 15 "name": "FileInputField",
16 "properties": { 16 "properties": {
17 "element": {"#": "fileInputField"} 17 "element": {"#": "fileInputField"}
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 786ef5c9..55a09fa8 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
@@ -175,8 +175,25 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
175 } 175 }
176 }, 176 },
177 checkFileExists:{ 177 checkFileExists:{
178 value: function(fileUri, folderUri, fileType){ 178 value: function(fileName, folderUri, fileType){
179 var status= this.application.ninja.coreIoApi.checkFileExists(fileUri, folderUri, fileType); 179 var uri = "", response=null, status=true;
180 //prepare absolute uri
181 if(/[^/\\]$/g.test(folderUri)){
182 folderUri = folderUri + "/";
183 }
184 if(!!fileType && (fileName.lastIndexOf(fileType) !== (fileName.length - fileType.length))){
185 fileName = fileName+fileType;
186 }
187 uri = ""+folderUri+fileName;
188 response= this.application.ninja.coreIoApi.fileExists({"uri":uri});
189 if(!!response && response.success && (response.status === 204)){
190 status = true;
191 }else if(!!response && response.success && (response.status === 404)){
192 status = false;
193 }else{
194 status = false;
195 }
196
180 if(status){ 197 if(status){
181 this.showError("! File already exists."); 198 this.showError("! File already exists.");
182 } 199 }