Skip to content

Add the extra css and js files to the json object that is output for the raw format. #1730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2022
Merged

Add the extra css and js files to the json object that is output for the raw format. #1730

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9348bd6
Add the extra css and js files to the json object that is output for the
drgrice1 May 20, 2022
4af1faa
Also include the third party css and js in the raw output, just in case
drgrice1 Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions lib/FormatRenderedProblem.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,17 @@ sub formatRenderedProblem {
push @cssFiles, @{ $rh_result->{flags}{extra_css_files} };
}
my %cssFilesAdded; # Used to avoid duplicates
my @extra_css_files;
for (@cssFiles) {
next if $cssFilesAdded{ $_->{file} };
$cssFilesAdded{ $_->{file} } = 1;
if ($_->{external}) {
push(@extra_css_files, $_);
$problemHeadText .= CGI::Link({ href => $_->{file}, rel => 'stylesheet' });
} else {
$problemHeadText .= CGI::Link({ href => getAssetURL($ce, $_->{file}), rel => 'stylesheet' });
my $url = getAssetURL($ce, $_->{file});
push(@extra_css_files, { file => $url, external => 0 });
$problemHeadText .= CGI::Link({ href => $url, rel => 'stylesheet' });
}
}

Expand All @@ -204,16 +208,20 @@ sub formatRenderedProblem {
if ($self->{inputs_ref}{outputformat} // '') eq 'sticky';

# Add JS files requested by problems via ADD_JS_FILE() in the PG file.
my @extra_js_files;
if (ref($rh_result->{flags}{extra_js_files}) eq 'ARRAY') {
my %jsFiles;
for (@{ $rh_result->{flags}{extra_js_files} }) {
next if $jsFiles{ $_->{file} };
$jsFiles{ $_->{file} } = 1;
my %attributes = ref($_->{attributes}) eq 'HASH' ? %{ $_->{attributes} } : ();
if ($_->{external}) {
push(@extra_js_files, $_);
$problemHeadText .= CGI::script({ src => $_->{file}, %attributes }, '');
} else {
$problemHeadText .= CGI::script({ src => getAssetURL($ce, $_->{file}), %attributes }, '');
my $url = getAssetURL($ce, $_->{file});
push(@extra_js_files, { file => $url, external => 0, attributes => $_->{attributes} });
$problemHeadText .= CGI::script({ src => $url, %attributes }, '');
}
}
}
Expand Down Expand Up @@ -427,6 +435,14 @@ sub formatRenderedProblem {
$output->{answerTemplate} = $answerTemplate if ($answerTemplate);
$output->{lang} = $PROBLEM_LANG_AND_DIR{lang};
$output->{dir} = $PROBLEM_LANG_AND_DIR{dir};
$output->{extra_css_files} = \@extra_css_files;
$output->{extra_js_files} = \@extra_js_files;

# Include third party css and javascript files. Only jquery, jquery-ui, mathjax, and bootstrap are needed for
# PG. See the comments before the subroutine definitions for load_css and load_js in pg/macros/PG.pl.
# The other files included are only needed to make themes work in the webwork2 formats.
$output->{third_party_css} = \@CSSLoads;
$output->{third_party_js} = \@JSLoads;

# Say what version of WeBWorK this is
$output->{ww_version} = $ce->{WW_VERSION};
Expand Down