update used space percent after each ajax call and display the notification

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f4d572b6954edcc8f3dbf788c783a14ba849628d..843c6e3fc4a5b899e7173295166e79f80860bd55 100644 (file)
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -32,14 +32,18 @@ Files={
                }
                if(response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
                        $('#max_upload').val(response.data.uploadMaxFilesize);
-                       $('#data-upload-form a').attr('original-title', response.data.maxHumanFilesize);
+                       $('#upload.button').attr('original-title', response.data.maxHumanFilesize);
+                       $('#usedSpacePercent').val(response.data.usedSpacePercent);
+                       Files.displayStorageWarnings();
                }
                if(response[0] == undefined) {
                        return;
                }
                if(response[0].uploadMaxFilesize !== undefined) {
                        $('#max_upload').val(response[0].uploadMaxFilesize);
-                       $('#data-upload-form a').attr('original-title', response[0].maxHumanFilesize);
+                       $('#upload.button').attr('original-title', response[0].maxHumanFilesize);
+                       $('#usedSpacePercent').val(response[0].usedSpacePercent);
+                       Files.displayStorageWarnings();
                }
 
        },
@@ -65,6 +69,10 @@ Files={
                return true;
        },
        displayStorageWarnings: function() {
+               if (!OC.Notification.isHidden()) {
+                       return;
+               }
+
                var usedSpacePercent = $('#usedSpacePercent').val();
                if (usedSpacePercent > 98) {
                        OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));

diff --git a/core/js/js.js b/core/js/js.js
index 3160159e2877dac665804a50c57559d7ce65d7e5..2daf63af9d82b02c949d407a5c6dde01c7d0feae 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -297,7 +297,7 @@ OC.Notification={
     hide: function(callback) {
         $("#notification").text('');
         $('#notification').fadeOut('400', function(){
-            if ($("#notification").text() === '') {
+            if (OC.Notification.isHidden()) {
                 if (OC.Notification.getDefaultNotificationFunction) {
                     OC.Notification.getDefaultNotificationFunction.call();
                 }
@@ -318,7 +318,10 @@ OC.Notification={
         notification.hide();
         notification.text(text);
         notification.fadeIn().css("display","inline");
-    }
+    },
+       isHidden: function() {
+               return ($("#notification").text() === '');
+       }
 };
 
 OC.Breadcrumb={