summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authormartin speleo <martin.speleo@gmail.com>2009-07-03 21:29:02 +0100
committermartin speleo <martin.speleo@gmail.com>2009-07-03 21:29:02 +0100
commit4da62038284831560abc5b7ccaa8fe800ac335e5 (patch)
treeb2ce89a0a902a404bf1152c5ed6a285fe120a197 /media
parent7db1aae5ee33c279fe463559fec89957f6fc4b20 (diff)
downloadtroggle-4da62038284831560abc5b7ccaa8fe800ac335e5.tar.gz
troggle-4da62038284831560abc5b7ccaa8fe800ac335e5.tar.bz2
troggle-4da62038284831560abc5b7ccaa8fe800ac335e5.zip
[svn] Fixed setContentHeight to work properly for eye candy view, whilst removing it from the non-eyecandy view
Diffstat (limited to 'media')
-rw-r--r--media/js/base.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/js/base.js b/media/js/base.js
index be96eaa..9f549ed 100644
--- a/media/js/base.js
+++ b/media/js/base.js
@@ -76,6 +76,7 @@ $(hoverLink).bind('mouseout',
};
function showEyeCandy(){
+contentHeight();
switchStylestyle("eyeCandy");
$("#eyeCandyFooterPopUps").load("/eyecandy");
$(".leftMargin,.rightMargin").show();
@@ -85,7 +86,7 @@ linkHover("#cavesLink","#richardBanner");
linkHover("#caversLink","#timeMachine");
linkHover("#surveyBinderLink","#surveyHover");
linkHover("#troggle","#timeMachine");
-contentHeight();};
+};
function killEyeCandy(){
$("#content").removeAttr("style")