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 /core | |
| 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 'core')
| -rw-r--r-- | core/js/share.js | 2 | ||||
| -rw-r--r-- | core/js/tests/specs/shareSpec.js | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/js/share.js b/core/js/share.js index 913c78bb732..5bde7e63f36 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -302,7 +302,7 @@ OC.Share = _.extend(OC.Share || {}, { } action.html('<span> ' + message + '</span>').prepend(icon); if (owner || recipients) { - action.find('.remoteAddress').tipsy({gravity: 's'}); + action.find('.remoteAddress').tooltip({placement: 'top'}); } } else { diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js index 5c76ea600b8..fbf6eecc8df 100644 --- a/core/js/tests/specs/shareSpec.js +++ b/core/js/tests/specs/shareSpec.js @@ -23,10 +23,10 @@ describe('OC.Share tests', function() { describe('markFileAsShared', function() { var $file; - var tipsyStub; + var tooltipStub; beforeEach(function() { - tipsyStub = sinon.stub($.fn, 'tipsy'); + tooltipStub = sinon.stub($.fn, 'tooltip'); $file = $('<tr><td class="filename"><div class="thumbnail"></div><span class="name">File name</span></td></tr>'); $file.find('.filename').append( '<span class="fileactions">' + @@ -38,7 +38,7 @@ describe('OC.Share tests', function() { }); afterEach(function() { $file = null; - tipsyStub.restore(); + tooltipStub.restore(); }); describe('displaying the share owner', function() { function checkOwner(input, output, title) { @@ -54,8 +54,8 @@ describe('OC.Share tests', function() { } else { expect($action.find('.remoteAddress').attr('title')).not.toBeDefined(); } - expect(tipsyStub.calledOnce).toEqual(true); - tipsyStub.reset(); + expect(tooltipStub.calledOnce).toEqual(true); + tooltipStub.reset(); } it('displays the local share owner as is', function() { @@ -172,8 +172,8 @@ describe('OC.Share tests', function() { } else { expect($action.find('.remoteAddress').attr('title')).not.toBeDefined(); } - expect(tipsyStub.calledOnce).toEqual(true); - tipsyStub.reset(); + expect(tooltipStub.calledOnce).toEqual(true); + tooltipStub.reset(); } it('displays the local share owner as is', function() { |