diff options
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 19cc3b26e44..245648a79e2 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -116,7 +116,7 @@ ownerDisplayName = $('#ownerDisplayName').val(); if (usedSpacePercent > 98) { if (owner !== oc_current_user) { - OC.Notification.show(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!', + OC.Notification.showTemporary(t('files', 'Storage of {owner} is full, files can not be updated or synced anymore!', { owner: ownerDisplayName })); return; } @@ -125,7 +125,7 @@ } if (usedSpacePercent > 90) { if (owner !== oc_current_user) { - OC.Notification.show(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)', + OC.Notification.showTemporary(t('files', 'Storage of {owner} is almost full ({usedSpacePercent}%)', { usedSpacePercent: usedSpacePercent, owner: ownerDisplayName })); return; } @@ -234,7 +234,6 @@ // display storage warnings setTimeout(Files.displayStorageWarnings, 100); - OC.Notification.setDefault(Files.displayStorageWarnings); // only possible at the moment if user is logged in or the files app is loaded if (OC.currentUser && OCA.Files.App) { @@ -247,12 +246,12 @@ // Use jquery-visibility to de-/re-activate file stats sync if ($.support.pageVisibility) { $(document).on({ - 'show.visibility': function() { + 'show': function() { if (!updateStorageStatisticsIntervalId) { updateStorageStatisticsIntervalId = setInterval(func, updateStorageStatisticsInterval); } }, - 'hide.visibility': function() { + 'hide': function() { clearInterval(updateStorageStatisticsIntervalId); updateStorageStatisticsIntervalId = 0; } @@ -265,6 +264,8 @@ $('#webdavurl').select(); }); + $('#upload').tooltip({placement:'right'}); + //FIXME scroll to and highlight preselected file /* if (getURLParameter('scrollto')) { @@ -452,7 +453,9 @@ var folderDropOptions = { var files = FileList.getSelectedFiles(); if (files.length === 0) { // single one selected without checkbox? - files = _.map(ui.helper.find('tr'), FileList.elementToFile); + files = _.map(ui.helper.find('tr'), function(el) { + return FileList.elementToFile($(el)); + }); } FileList.move(_.pluck(files, 'name'), targetPath); |