From f6f37985a5e5aa96fb79244f89ba1c998ce60ae0 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Feb 2013 19:35:51 +0100 Subject: updated bootstrap, fixed tooltips --- module/web/static/js/utils/animations.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'module/web/static/js/utils') 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; }; -- cgit v1.2.3