1 files changed, 16 insertions, 11 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 8d0f9e06ad7..9fa2a384b5d 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -25,6 +25,18 @@ Files={
 			delete uploadingFiles[index];
 		});
 		procesSelection();
+	},
+	containsInvalidCharacters:function (name) {
+		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;
+			}
+		}
+		$('#notification').fadeOut();
+		return false;
 	}
 };
 $(document).ready(function() {
@@ -505,17 +517,10 @@ $(document).ready(function() {
 		$(this).append(input);
 		input.focus();
 		input.change(function(){
-            if (type != 'web') {
-                var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
-                for (var i = 0; i < invalid_characters.length; i++) {
-                    if ($(this).val().indexOf(invalid_characters[i]) != -1) {
-                        $('#notification').text(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
-                        $('#notification').fadeIn();
-                        return;
-                    }
-                }
-            }
-            var name = getUniqueName($(this).val());
+			if (type != 'web' && Files.containsInvalidCharacters($(this).val())) {
+				return;
+			}
+			var name = getUniqueName($(this).val());
 			if (name != $(this).val()) {
 				FileList.checkName(name, $(this).val(), true);
 				var hidden = true;