diff options
author | Bart Visscher <bartv@thisnet.nl> | 2011-11-23 21:08:26 +0100 |
---|---|---|
committer | Bart Visscher <bartv@thisnet.nl> | 2011-11-23 21:08:26 +0100 |
commit | bae6c1167cbe47280c24d8aa9ad7ee048c8ab4eb (patch) | |
tree | f077558d240d660abb4c75e0e5ef2848b9585107 /core/js/jquery-tipsy.js | |
parent | 5e037bfd5458436e8f6d83d4fe53f62b53cd8ae9 (diff) | |
parent | ee549dfb3802e98156e96a4cf549854b9d4f791a (diff) | |
download | nextcloud-server-bae6c1167cbe47280c24d8aa9ad7ee048c8ab4eb.tar.gz nextcloud-server-bae6c1167cbe47280c24d8aa9ad7ee048c8ab4eb.zip |
Merge branch 'fullcalendar'
Diffstat (limited to 'core/js/jquery-tipsy.js')
-rw-r--r-- | core/js/jquery-tipsy.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/js/jquery-tipsy.js b/core/js/jquery-tipsy.js index 9567ed3bacc..ef4bbfd87a1 100644 --- a/core/js/jquery-tipsy.js +++ b/core/js/jquery-tipsy.js @@ -31,6 +31,10 @@ height: this.$element[0].offsetHeight }); + if (this.options.className) { + $tip.addClass(maybeCall(this.options.className, this.$element[0])); + } + var actualWidth = $tip[0].offsetWidth, actualHeight = $tip[0].offsetHeight, gravity = maybeCall(this.options.gravity, this.$element[0]); @@ -61,9 +65,6 @@ $tip.css(tp).addClass('tipsy-' + gravity); $tip.find('.tipsy-arrow')[0].className = 'tipsy-arrow tipsy-arrow-' + gravity.charAt(0); - if (this.options.className) { - $tip.addClass(maybeCall(this.options.className, this.$element[0])); - } if (this.options.fade) { $tip.stop().css({opacity: 0, display: 'block', visibility: 'visible'}).animate({opacity: this.options.opacity}); |