aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js2
-rw-r--r--core/js/tests/specs/shareSpec.js14
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() {