summaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorHendrik Leppelsack <hendrik@leppelsack.de>2015-07-26 13:01:25 +0200
committerHendrik Leppelsack <hendrik@leppelsack.de>2015-07-26 13:01:25 +0200
commit5b21ed805ce0525f24ffffd173f1f465cd6b13aa (patch)
treeaa604633ce6370882819b3ecd0eec407f571bad3 /core/js/js.js
parent5da44c69cbaf02598eb1c241457dc7fe8e684e85 (diff)
parent56cff46dc32a0049840bb09f1769413eace064d6 (diff)
downloadnextcloud-server-5b21ed805ce0525f24ffffd173f1f465cd6b13aa.tar.gz
nextcloud-server-5b21ed805ce0525f24ffffd173f1f465cd6b13aa.zip
Merge pull request #17871 from owncloud/add-fallback-to-shim
Add `fallback` to shim
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 226fea3a3cb..2cc50dfb198 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1888,6 +1888,8 @@ jQuery.fn.tipsy = function(argument) {
}
if(argument.title) {
options.title = argument.title;
+ } else if(argument.fallback) {
+ options.title = argument.fallback;
}
// destroy old tooltip in case the title has changed
jQuery.fn.tooltip.call(this, 'destroy');