diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/fileactions.js | 1 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 17 | ||||
| -rw-r--r-- | apps/files/js/files.js | 7 |
3 files changed, 15 insertions, 10 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index a2dcf266bf9..1d0493f2140 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -426,6 +426,7 @@ ); } ); + $actionEl.tooltip({placement:'top'}); return $actionEl; }, diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 1f86f5a392a..4802e07e965 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -243,6 +243,8 @@ this.$el.find('.download').click(_.bind(this._onClickDownloadSelected, this)); this.$el.find('.delete-selected').click(_.bind(this._onClickDeleteSelected, this)); + this.$el.find('.selectedActions a').tooltip({placement:'top'}); + this.setupUploadEvents(); this.$container.on('scroll', _.bind(this._onScroll, this)); @@ -895,6 +897,7 @@ fileData.extraData = fileData.extraData.substr(1); } nameSpan.addClass('extra-data').attr('title', fileData.extraData); + nameSpan.tooltip({placement: 'right'}); } // dirs can show the number of uploaded files if (type === 'dir') { @@ -1575,7 +1578,7 @@ }; function restore() { - input.tipsy('hide'); + input.tooltip('hide'); tr.data('renaming',false); form.remove(); td.children('a.name').show(); @@ -1590,7 +1593,7 @@ try { var newName = input.val(); - input.tipsy('hide'); + input.tooltip('hide'); form.remove(); if (newName !== oldname) { @@ -1642,8 +1645,8 @@ } } catch (error) { input.attr('title', error); - input.tipsy({gravity: 'w', trigger: 'manual'}); - input.tipsy('show'); + input.tooltip({placement: 'left', trigger: 'manual'}); + input.tooltip('show'); input.addClass('error'); } return false; @@ -1652,12 +1655,12 @@ // verify filename on typing try { checkInput(); - input.tipsy('hide'); + input.tooltip('hide'); input.removeClass('error'); } catch (error) { input.attr('title', error); - input.tipsy({gravity: 'w', trigger: 'manual'}); - input.tipsy('show'); + input.tooltip({placement: 'left', trigger: 'manual'}); + input.tooltip('show'); input.addClass('error'); } if (event.keyCode === 27) { diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 19cc3b26e44..55fdb96ebda 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) { @@ -265,6 +264,8 @@ $('#webdavurl').select(); }); + $('#upload').tooltip({placement:'right'}); + //FIXME scroll to and highlight preselected file /* if (getURLParameter('scrollto')) { |