From b8dea97443c6967a158e93905de84af042e1c20e Mon Sep 17 00:00:00 2001
From: Bryan Holladay <holladay@longsight.com>
Date: Fri, 8 Aug 2014 14:52:51 +0000
Subject: [PATCH] SAK-27568 show security message and pop up syllabus redirects
 in a new window if http iframe is inside https sakai instance making sure
 iframe height is correct

git-svn-id: https://source.sakaiproject.org/svn/syllabus/trunk@311714 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 .../org/sakaiproject/jsf/syllabus/SyllabusIframeRender.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusIframeRender.java b/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusIframeRender.java
index 83ff3dcf8a21..6491d98cfb7a 100644
--- a/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusIframeRender.java
+++ b/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusIframeRender.java
@@ -79,9 +79,10 @@ public void encodeBegin(FacesContext context, UIComponent component)
       }
       boolean secureHttp = ServerConfigurationService.getServerUrl().startsWith("https");
       if(redirectUrl.startsWith("http:") && secureHttp){
-    	  writer.write("<script type='text/javascript'>window.open('" + redirectUrl + "');$(window).load(function (){mySetMainFrameHeight(mainframeId);});</script>");
+    	  writer.write("<script type='text/javascript'>window.open('" + redirectUrl + "');</script>");
     	  writer.write(rb.getFormattedMessage("iframeSecurity", new String[]{redirectUrl}));
       }else{
+    	  writer.write("<script type='text/javascript'>setTimeout(function(){mySetMainFrameHeight(mainframeId);}, 1000);</script>");
     	  writer.write("<iframe src=\"" + redirectUrl + "\"");
     	  writer.write(" width=\"" + widthIn + "\"");
     	  writer.write(" height=\"" + heightIn + "\"");