summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/biomon/static/biomon/js/biomon.js15
1 files 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%');
}
});
}