From e724d05165de584fc100399138e7c22e044b44ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Ates?= Date: Fri, 22 Jan 2016 17:52:14 +0100 Subject: [PATCH] Remove jquery animate, juste modify div height. --- src/biomon/static/biomon/js/biomon.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/biomon/static/biomon/js/biomon.js b/src/biomon/static/biomon/js/biomon.js index 628ed9e..43a0eb9 100644 --- a/src/biomon/static/biomon/js/biomon.js +++ b/src/biomon/static/biomon/js/biomon.js @@ -134,18 +134,11 @@ } $('div#controlbar').empty(); $('div#controlbar').append(content); - $('div#content-1').animate({ - height: "88%", - }, 300, "linear", function() { - $('div#controlbar').fadeIn(); - } - ); + $('div#content-1').height('88%'); + $('div#controlbar').fadeIn(); } else { - $('div#controlbar').fadeOut(500, function(){ - $('div#content-1').animate({ - height: "100%", - }, 300, "linear"); - }); + $('div#controlbar').fadeOut(500); + $('div#content-1').height('100%'); } }); }