SAK-27568 show security message and pop up syllabus redirects in a ne…

…w 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

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 + "\"");