aboutsummaryrefslogtreecommitdiff
path: root/js/io
diff options
context:
space:
mode:
authorAnanya Sen2012-04-06 15:31:43 -0700
committerAnanya Sen2012-04-06 15:31:43 -0700
commitefe18b4c8e52667683727139e9f9e28f66381164 (patch)
tree7c6a22bec2b556cbb2f7732fc8595d9f713ad064 /js/io
parent0f6cee34ae696f72c7bedc23b7aaa0b1e08b5f6b (diff)
downloadninja-efe18b4c8e52667683727139e9f9e28f66381164.tar.gz
block filenames and directories with all space
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/io')
-rwxr-xr-xjs/io/system/coreioapi.js2
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js1
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js1
3 files changed, 3 insertions, 1 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index ed7df972..a06f45c6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -1092,7 +1092,7 @@ exports.CoreIoApi = Montage.create(Component, {
1092 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri); 1092 isWindowsUri = /^([a-zA-Z]:)([\\/][^<>:"/\\|?*]+)*[\\/]?$/gi.test(uri);
1093 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix 1093 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
1094 status = isWindowsUri || isUnixUri; 1094 status = isWindowsUri || isUnixUri;
1095 if(isWindowsUri && isUnixUri){status = false;} 1095 if((uri === "") || (isWindowsUri && isUnixUri)){status = false;}
1096 } 1096 }
1097 return status; 1097 return status;
1098 } 1098 }
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 552e8f6f..1a26c99c 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
@@ -493,6 +493,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
493 var status = false; 493 var status = false;
494 if((fileName !== null) && (fileName !== "")){ 494 if((fileName !== null) && (fileName !== "")){
495 fileName = fileName.replace(/^\s+|\s+$/g,""); 495 fileName = fileName.replace(/^\s+|\s+$/g,"");
496 if(fileName === ""){return false;}
496 status = !(/[/\\]/g.test(fileName)); 497 status = !(/[/\\]/g.test(fileName));
497 if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden 498 if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
498 status = !(/^\./g.test(fileName)); 499 status = !(/^\./g.test(fileName));
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 5df91ab9..e2f50ff5 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
@@ -266,6 +266,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
266 var status = false; 266 var status = false;
267 if((fileName !== null) && (fileName !== "")){ 267 if((fileName !== null) && (fileName !== "")){
268 fileName = fileName.replace(/^\s+|\s+$/g,""); 268 fileName = fileName.replace(/^\s+|\s+$/g,"");
269 if(fileName === ""){return false;}
269 status = !(/[/\\]/g.test(fileName)); 270 status = !(/[/\\]/g.test(fileName));
270 if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden 271 if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
271 status = !(/^\./g.test(fileName)); 272 status = !(/^\./g.test(fileName));