diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:42:22 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 23:42:22 +0100 |
| commit | 9fdd1bafdc2aafcf27b939ba259818830f2df25e (patch) | |
| tree | e3adba60b879b3b6199abbbd5457807435ff4791 /core | |
| parent | efecb694eff7129d1ca24627ac366f3bcc939864 (diff) | |
| parent | 5e711f37ca3f009317a3c8cd0e47ed4f15922142 (diff) | |
| download | nextcloud-server-9fdd1bafdc2aafcf27b939ba259818830f2df25e.tar.gz nextcloud-server-9fdd1bafdc2aafcf27b939ba259818830f2df25e.zip | |
Merge branch 'master' into filesystem
Diffstat (limited to 'core')
| -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}); |