summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-07-27 10:29:48 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-07-27 10:29:48 +0200
commit4edfadac96fcf267c97371e67e5feccec94b337e (patch)
tree69a4a5e7bd7b6b888ccb9ab7b287931c61aabc79
parent660e36b49b9fc129274e90923628eaabd5f2bd0a (diff)
parent6574dfcf23a3f24d40f6b1cc1cd3f870f818132c (diff)
downloadnextcloud-server-4edfadac96fcf267c97371e67e5feccec94b337e.tar.gz
nextcloud-server-4edfadac96fcf267c97371e67e5feccec94b337e.zip
Merge pull request #17878 from owncloud/fix-tipsy-fallback-title
Fix title attribute of tipsy shim
-rw-r--r--core/js/js.js4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 2cc50dfb198..5f7df5fb551 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1886,9 +1886,7 @@ jQuery.fn.tipsy = function(argument) {
if(argument.html) {
options.html = true;
}
- if(argument.title) {
- options.title = argument.title;
- } else if(argument.fallback) {
+ if(argument.fallback) {
options.title = argument.fallback;
}
// destroy old tooltip in case the title has changed