aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-15 16:09:47 -0800
committerValerio Virgillito2012-02-15 16:09:47 -0800
commitd366c0bd1af6471511217ed574083e15059519b5 (patch)
treec8c9f9af761457e3c5f4c6774fb0fbba851df0c4 /js/lib
parent997ce3fb65f27b3d6f331f63b5dc22d3c7fb8f1e (diff)
parentb85bfb54aaca3ccca3c1ef09115de925cd67f4e9 (diff)
downloadninja-d366c0bd1af6471511217ed574083e15059519b5.tar.gz
Merge branch 'refs/heads/integration'
Diffstat (limited to 'js/lib')
-rwxr-xr-x[-rw-r--r--]js/lib/NJUtils.js18
-rwxr-xr-x[-rw-r--r--]js/lib/nj-base.js0
2 files changed, 18 insertions, 0 deletions
diff --git a/js/lib/NJUtils.js b/js/lib/NJUtils.js
index 0e886ae7..8daafa42 100644..100755
--- a/js/lib/NJUtils.js
+++ b/js/lib/NJUtils.js
@@ -227,8 +227,26 @@ exports.NJUtils = Object.create(Object.prototype, {
227 ///// Return the last part of a path (e.g. filename) 227 ///// Return the last part of a path (e.g. filename)
228 getFileNameFromPath : { 228 getFileNameFromPath : {
229 value: function(path) { 229 value: function(path) {
230 path = path.replace(/[/\\]$/g,"");
231 path = path.replace(/\\/g,"/");
230 return path.substr(path.lastIndexOf('/') + 1); 232 return path.substr(path.lastIndexOf('/') + 1);
231 } 233 }
234 },
235 /***
236 * file name validation
237 */
238 isValidFileName:{
239 value: function(fileName){
240 var status = false;
241 if(fileName !== ""){
242 fileName = fileName.replace(/^\s+|\s+$/g,"");
243 status = !(/[/\\]/g.test(fileName));
244 if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
245 status = !(/^\./g.test(fileName));
246 }
247 }
248 return status;
249 }
232 } 250 }
233 251
234}); 252});
diff --git a/js/lib/nj-base.js b/js/lib/nj-base.js
index d1e1ff5b..d1e1ff5b 100644..100755
--- a/js/lib/nj-base.js
+++ b/js/lib/nj-base.js