aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorAnanya Sen2012-02-02 12:59:41 -0800
committerAnanya Sen2012-02-02 12:59:41 -0800
commit476a25e8a662270dfe5b37c560e4235f02b146e4 (patch)
tree11fbb125e67e09e8b245c84370c1526e9841188f /js
parente806afea0eb1b66ac457471983db0e3d5942d222 (diff)
downloadninja-476a25e8a662270dfe5b37c560e4235f02b146e4.tar.gz
uri validation moved to file io apis
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js')
-rwxr-xr-xjs/io/system/coreioapi.js21
-rw-r--r--js/io/ui/new-file-dialog/new-file-options-navigator.reel/new-file-options-navigator.js2
-rw-r--r--js/io/ui/save-as-dialog.reel/save-as-dialog.js2
-rwxr-xr-xjs/lib/NJUtils.js21
4 files changed, 23 insertions, 23 deletions
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index f4ab56b6..f0ca568f 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -983,6 +983,27 @@ exports.CoreIoApi = Montage.create(Component, {
983 return retValue; 983 return retValue;
984 } 984 }
985 }, 985 },
986
987 /***
988 * checks for valid uri pattern
989 * also flags if Windows uri pattern and Unix uri patterns are mixed
990 */
991 isValidUri:{
992 value: function(uri){
993 var isWindowsUri=false, isUnixUri=false,status=false;
994 if(uri !== ""){
995 uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces
996
997 //for local machine folder uri
998 isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri);
999 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
1000 status = isWindowsUri || isUnixUri;
1001 if(isWindowsUri && isUnixUri){status = false;}
1002 }
1003 return status;
1004 }
1005 },
1006
986 //////////////////////////////////////////////////////////////////// 1007 ////////////////////////////////////////////////////////////////////
987 /*** 1008 /***
988 * check if the file exists 1009 * check if the file exists
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 cee8d4b7..a747b8de 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
@@ -335,7 +335,7 @@ var NewFileOptionsNavigator = exports.NewFileOptionsNavigator = Montage.create(C
335 335
336 isValidUri:{ 336 isValidUri:{
337 value: function(uri){ 337 value: function(uri){
338 var status= nj.isValidUri(uri); 338 var status= this.application.ninja.coreIoApi.isValidUri(uri);
339 if(uri !== ""){ 339 if(uri !== ""){
340 if(!status){ 340 if(!status){
341 this.showError("! Invalid directory."); 341 this.showError("! Invalid directory.");
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 371aa9a7..b20bed87 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
@@ -152,7 +152,7 @@ var SaveAsDialog = exports.SaveAsDialog = Montage.create(Component, {
152 152
153 isValidUri:{ 153 isValidUri:{
154 value: function(uri){ 154 value: function(uri){
155 var status= nj.isValidUri(uri); 155 var status= this.application.ninja.coreIoApi.isValidUri(uri);
156 if(uri !== ""){ 156 if(uri !== ""){
157 if(!status){ 157 if(!status){
158 this.showError("! Invalid directory."); 158 this.showError("! Invalid directory.");
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 960c832f..74039e64 100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -211,27 +211,6 @@ exports.NJUtils = Object.create(Object.prototype, {
211 return path.substr(path.lastIndexOf('/') + 1); 211 return path.substr(path.lastIndexOf('/') + 1);
212 } 212 }
213 }, 213 },
214
215 /***
216 * checks for valid uri pattern
217 * also flags if Windows uri pattern and Unix uri patterns are mixed
218 */
219 isValidUri:{
220 value: function(uri){
221 var isWindowsUri=false, isUnixUri=false,status=false;
222 if(uri !== ""){
223 uri = uri.replace(/^\s+|\s+$/g,""); // strip any leading or trailing spaces
224
225 //for local machine folder uri
226 isWindowsUri = /^([a-zA-Z]:)(\\[^<>:"/\\|?*]+)*\\?$/gi.test(uri);
227 isUnixUri = /^(\/)?(\/(?![.])[^/]*)*\/?$/gi.test(uri);//folders beginning with . are hidden on Mac / Unix
228 status = isWindowsUri || isUnixUri;
229 if(isWindowsUri && isUnixUri){status = false;}
230 }
231 return status;
232 }
233 },
234
235 /*** 214 /***
236 * file name validation 215 * file name validation
237 */ 216 */