summaryrefslogtreecommitdiffstats
path: root/module/web/static/js/utils/animations.js
diff options
context:
space:
mode:
Diffstat (limited to 'module/web/static/js/utils/animations.js')
-rw-r--r--module/web/static/js/utils/animations.js11
1 files changed, 9 insertions, 2 deletions
diff --git a/module/web/static/js/utils/animations.js b/module/web/static/js/utils/animations.js
index 789359e0c..ea06669b3 100644
--- a/module/web/static/js/utils/animations.js
+++ b/module/web/static/js/utils/animations.js
@@ -44,7 +44,7 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) {
};
// calculate the height and write it to data, better used on invisible elements
- jQuery.fn.calculateHeight = function() {
+ jQuery.fn.calculateHeight = function(setHeight) {
var o = jQuery(this[0]);
var height = o.height();
if (!height) {
@@ -57,6 +57,9 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) {
o.css('visibility', '');
}
+ if (setHeight)
+ o.css('height', height);
+
o.data('height', height);
return this;
};
@@ -78,7 +81,11 @@ define(['jquery', 'underscore', 'transit'], function(jQuery, _) {
placement || (placement = 'top');
var o = jQuery(this[0]);
- o.find('[data-toggle="tooltip"]').tooltip({delay: {show: 500, hide: 100}, placement: placement});
+ o.find('[data-toggle="tooltip"]').tooltip(
+ {
+ delay: {show: 800, hide: 100},
+ placement: placement
+ });
return this;
};