Merge branch 'refs/heads/integration'

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, {
     ///// Return the last part of a path (e.g. filename)
     getFileNameFromPath : {
         value: function(path) {
+            path = path.replace(/[/\\]$/g,"");
+            path = path.replace(/\\/g,"/");
             return path.substr(path.lastIndexOf('/') + 1);
         }
+    },
+    /***
+     * file name validation
+     */
+    isValidFileName:{
+        value: function(fileName){
+            var status = false;
+            if(fileName !== ""){
+                fileName = fileName.replace(/^\s+|\s+$/g,"");
+                status = !(/[/\\]/g.test(fileName));
+                if(status && navigator.userAgent.indexOf("Macintosh") != -1){//for Mac files beginning with . are hidden
+                    status = !(/^\./g.test(fileName));
+                }
+            }
+            return status;
+        }
     }
     
 });
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