--- rat/lonwrapper.pm 2019/05/02 02:12:31 1.69
+++ rat/lonwrapper.pm 2020/02/17 00:13:22 1.74
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Wrapper for external and binary files as standalone resources
#
-# $Id: lonwrapper.pm,v 1.69 2019/05/02 02:12:31 raeburn Exp $
+# $Id: lonwrapper.pm,v 1.74 2020/02/17 00:13:22 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -89,7 +89,7 @@ sub wrapper {
$args->{'only_body'} = $env{'form.only_body'};
}
- my ($countdown,$donemsg);
+ my ($countdown,$donemsg,$headjs);
if (($exttool) && (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i)) {
$Apache::lonhomework::browse = &Apache::lonnet::allowed('bre',$url);
if ($env{'form.markaccess'}) {
@@ -135,7 +135,24 @@ sub wrapper {
}
}
- my $startpage = &Apache::loncommon::start_page('Menu',undef,$args).$countdown.$donemsg;
+#
+# 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 = '
+'."\n";
+ }
+
+ my $startpage = &Apache::loncommon::start_page('Menu',$headjs,$args).$countdown.$donemsg;
my $endpage = &Apache::loncommon::end_page();
if (($uselink) && ($title eq '')) {
@@ -167,9 +184,9 @@ sub wrapper {
$output .= <<"ENDLINK";