diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-02-28 10:49:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-28 10:49:14 +0100 |
| commit | b5a6f03362794460222a1fc2d949882884df249d (patch) | |
| tree | 84043c0a39930641f52e4d9a007bae5e9321bbc8 /apps | |
| parent | b72b02778dac5b1ab15594de8dce0ccd04a030ba (diff) | |
| parent | 86149508d0013d30433b0cf38567629cef45cca2 (diff) | |
| download | nextcloud-server-b5a6f03362794460222a1fc2d949882884df249d.tar.gz nextcloud-server-b5a6f03362794460222a1fc2d949882884df249d.zip | |
Merge pull request #3643 from nextcloud/replace-deprecated-tipsy
Replace deprecated $.tipsy(...) by $.tooltip(...)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/breadcrumb.js | 2 | ||||
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index ff9700456da..2a4c2bc8a52 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -272,7 +272,7 @@ // set the path of this one as title for the ellipsis this.$el.find('.crumb.ellipsized') .attr('title', $crumb.attr('data-dir')) - .tipsy(); + .tooltip(); this.$el.find('.ellipsis') .wrap('<a class="ellipsislink" href="' + encodeURI(OC.generateUrl('apps/files/?dir=' + $crumb.attr('data-dir'))) + '"></a>'); } diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 0fbf3f559fe..c93abd5244d 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -895,7 +895,7 @@ OC.Uploader.prototype = _.extend({ start: function(e) { self.log('start', e, null); //hide the tooltip otherwise it covers the progress bar - $('#upload').tipsy('hide'); + $('#upload').tooltip('hide'); }, fail: function(e, data) { var upload = self.getUpload(data); @@ -991,7 +991,7 @@ OC.Uploader.prototype = _.extend({ + '</span><span class="mobile">' + t('files', '...') + '</span></em>'); - $('#uploadprogressbar').tipsy({gravity:'n', fade:true, live:true}); + $('#uploadprogressbar').tooltip({placement: 'bottom'}); self._showProgressBar(); self.trigger('start', e, data); }); |