From 1635707eb7886ecccfb65704e269dd70d5ec2bd0 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Mon, 21 Oct 2013 15:06:19 +0200
Subject: [PATCH] OO-824 fix wrong auto height for LTI
---
.../java/org/olat/course/nodes/basiclti/_content/run.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/basiclti/_content/run.html b/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
index 9abe81df8db..0bc6831d1cb 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
+++ b/src/main/java/org/olat/course/nodes/basiclti/_content/run.html
@@ -1,7 +1,7 @@
<div class="b_iframe_wrapper">
- <iframe id="IMSBasicLTIFrame" src="$mapperUri" marginwidth="0" marginheight="0" #if($width) width="${width}px" #end height="#if($height)${height}#else{400}#{end}px" style="#if($width) width:${width}px;#end #if($height)height:${height}px;#{end}"></iframe>
+ <iframe id="IMSBasicLTIFrame" src="$mapperUri" marginwidth="0" marginheight="0" #if($width!='auto') width="${width}px" #end height="#if($height!='auto')${height}#else 400#{end}px" style="#if($width!='auto') width:${width}px;#end #if($height!='auto')height:${height}px;#{end}"></iframe>
</div>
-#if(!$height)
+#if(!$height || 'auto' == $height)
<script type="text/javascript">
/* <![CDATA[ */
## no window.onresize due to IE bug which triggers recurstion: http://snook.ca/archives/javascript/ie6_fires_onresize/
--
GitLab