--- rat/lonwrapper.pm	2020/01/14 17:14:11	1.49.2.7.2.1
+++ rat/lonwrapper.pm	2020/02/17 01:31:20	1.49.2.7.2.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Wrapper for external and binary files as standalone resources
 #
-# $Id: lonwrapper.pm,v 1.49.2.7.2.1 2020/01/14 17:14:11 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.49.2.7.2.2 2020/02/17 01:31:20 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -89,7 +89,26 @@ sub wrapper {
         $args->{'only_body'} = $env{'form.only_body'};
     }
 
-    my $startpage = &Apache::loncommon::start_page('Menu',undef,$args);
+    my $headjs;
+
+#
+# Where iframe is in use, if window.onload() executes before the custom resize function
+# has been defined (jQuery), two global javascript vars (LCnotready and LCresizedef)
+# are used to ensure document.ready() triggers a call to resize, so the iframe contents
+# do not obscure the Functions menu.
+#
+
+    unless (($env{'browser.mobile'}) || ($exttool eq 'window') || ($exttool eq 'tab') || $uselink) {
+        $headjs = '
+<script type="text/javascript">
+// <![CDATA[
+var LCnotready = 0;
+var LCresizedef = 0;
+// ]]>
+</script>'."\n";
+    }
+
+    my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args);
     my $endpage = &Apache::loncommon::end_page();
 
     if (($uselink) && ($title eq '')) {
@@ -194,8 +213,20 @@ ENDLINK
                 var pos = height + hdrtop + offset;
                 \$('.LC_iframecontainer').css('top', pos);
             });
+            LCresizedef = 1;
+            if (LCnotready == 1) {
+                LCnotready = 0;
+                \$(window).trigger('resize');
+            }
         });
-        window.onload = function(){  \$(window).trigger('resize') };
+        window.onload = function(){
+            if (LCresizedef) {
+                LCnotready = 0;
+                \$(window).trigger('resize');
+            } else {
+                LCnotready = 1;
+            }
+        };
 SCRIPT
         # javascript will position the iframe if window was resized (or zoomed)
         my $dest = &HTML::Entities::encode($url.$anchor,'&<>"');
@@ -243,8 +274,8 @@ sub handler {
 
     for ($url){
         s|^/adm/wrapper||;
-        $is_ext = $_ =~ s|^/ext/|http://|;         
-        s|http://https://|https://|;
+        $is_ext = $_ =~ s|^/ext/|http://|;
+        s|http://https://?|https://| if ($is_ext);
         s|&colon;|:|g;
     }