From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 6 Jan 2013 21:28:21 +0000 (+0100)
Subject: Merge branch 'master' into fixing-998-master
X-Git-Tag: v5.0.0alpha1~192^2~14
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=07b3b23a39d3592602efea3ab6448178fb1b166a;p=nextcloud-server.git

Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/js/files.js
---

07b3b23a39d3592602efea3ab6448178fb1b166a
diff --cc apps/files/js/files.js
index 6166b240e83,ba2495eb728..ac47f390826
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@@ -26,27 -26,30 +26,37 @@@ Files=
  		});
  		procesSelection();
  	},
- 	containsInvalidCharacters:function (name) {
+     isFileNameValid:function (name) {
+         if (name === '.') {
 -            $('#notification').text(t('files', "'.' is an invalid file name."));
 -            $('#notification').fadeIn();
++            OC.Notification.show(t('files', "'.' is an invalid file name."));
+             return false;
+         }
+         if (name.length == 0) {
 -            $('#notification').text(t('files', "File name cannot be empty."));
 -            $('#notification').fadeIn();
++            OC.Notification.show(t('files', "File name cannot be empty."));
+             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();
 +				OC.Notification.show(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
- 				return true;
+ 				return false;
  			}
  		}
 -		$('#notification').fadeOut();
 +        OC.Notification.hide();
- 		return false;
+ 		return true;
 -	}
 +	},
 +    displayStorageWarnings: function() {
 +        var usedSpacePercent = $('#usedSpacePercent').val();
 +        if (usedSpacePercent > 98) {
 +            OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
 +            return;
 +        }
 +        if (usedSpacePercent > 90) {
 +            OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
 +        }
 +    }
  };
  $(document).ready(function() {
  	Files.bindKeyboardShortcuts(document, jQuery); 
@@@ -510,10 -521,11 +520,10 @@@
  		$(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'));
 -				$('#notification').fadeIn();
 +                OC.Notification.show(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
  				return;
  			}
  			if (FileList.lastAction) {