summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Ates <mates@entrouvert.com>2016-01-22 16:52:14 (GMT)
committerMikaël Ates <mates@entrouvert.com>2016-01-22 16:52:14 (GMT)
commite724d05165de584fc100399138e7c22e044b44ef (patch)
treeaa09b1e1293e3a2b33023211ccaaa64aef210f45
parentc6c13465180b01b5d755e86cc37a2fb4e42bfd09 (diff)
downloadbiomon-master.zip
biomon-master.tar.gz
biomon-master.tar.bz2
Remove jquery animate, juste modify div height.HEADmaster
-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%');
}
});
}