rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!

adding file name checks and notifications to isFileNameValid() for . and empty file name

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cc47ec2612e1bc79d24776d6cde9c4fd4f899388..22d701d8ff919c464c7e2a982134a22cc0a884bf 100644 (file)
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -149,7 +149,7 @@ var FileList={
                        event.stopPropagation();
                        event.preventDefault();
                        var newname=input.val();
-                       if (Files.containsInvalidCharacters(newname) || newname === '.') {
+                       if (!Files.isFileNameValid(newname)) {
                                return false;
                        }
                        if (newname != name) {

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6a37d9e7f538fdebcb0760d81b80da01019e2ee9..ba2495eb7280ce4b571fca0f0694b8ce0ae9ea3c 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -26,17 +26,29 @@ Files={
                });
                procesSelection();
        },
-       containsInvalidCharacters:function (name) {
+    isFileNameValid:function (name) {
+        if (name === '.') {
+            $('#notification').text(t('files', "'.' is an invalid file name."));
+            $('#notification').fadeIn();
+            return false;
+        }
+        if (name.length == 0) {
+            $('#notification').text(t('files', "File name cannot be empty."));
+            $('#notification').fadeIn();
+            return false;
+        }
+
+        // check for invalid characters
                var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
                for (var i = 0; i < invalid_characters.length; i++) {
                        if (name.indexOf(invalid_characters[i]) != -1) {
                                $('#notification').text(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
                                $('#notification').fadeIn();
-                               return true;
+                               return false;
                        }
                }
                $('#notification').fadeOut();
-               return false;
+               return true;
        }
 };
 $(document).ready(function() {
@@ -509,7 +521,7 @@ $(document).ready(function() {
                $(this).append(input);
                input.focus();
                input.change(function(){
-                       if (type != 'web' && Files.containsInvalidCharacters($(this).val())) {
+                       if (type != 'web' && !Files.isFileNameValid($(this).val())) {
                                return;
                        } else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') {
                                $('#notification').text(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));