Commit 3844427b authored by Liam's avatar Liam Committed by Rebecca Blundell
Browse files

Bug #1765276: Replaces bootstraps js files with the minified ones

behatnotneeded

Change-Id: I6c51c227f18c6cca3ba83adc8fcd4b7945d9e8db
parent 8a9cda0c
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -190,7 +190,7 @@
<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
<script src="assets/Twig/js/jquery.js"></script>
<!-- Include all compiled plugins (below), or include individual files as needed -->
<script src="assets/Twig/js/bootstrap.js"></script>
<script src="assets/Twig/js/bootstrap.min.js"></script>
<script type="text/javascript">
var featureData = [
......
......@@ -215,7 +215,7 @@ function set_report_styling() {
$font_files = array_values(array_diff(scandir($font_awesome_dir), array('.', '..')));
$font_awesome_css = get_mahararoot_dir() . "/htdocs/theme/raw/style/lib/font-awesome/font-awesome.css";
$jquery_js = get_mahararoot_dir() . "/htdocs/js/jquery/jquery.js";
$bootstrap_js = get_mahararoot_dir() . "/htdocs/lib/bootstrap/assets/javascripts/bootstrap.js";
$bootstrap_js = get_mahararoot_dir() . "/htdocs/lib/bootstrap/assets/javascripts/bootstrap.min.js";
if (file_exists($report_root . '/composer.json')) {
echo "Adding styling for html report...\n";
......@@ -234,6 +234,6 @@ function set_report_styling() {
// JavaScript
copy($jquery_js, $report_js . "/jquery.js");
copy($bootstrap_js, $report_js . "/bootstrap.js");
copy($bootstrap_js, $report_js . "/bootstrap.min.js");
}
}
......@@ -44,7 +44,7 @@
<link rel="stylesheet" type="text/css" href="{$cssurl}">
{/foreach}
<script type="application/javascript" src="{$WWWROOT}/lib/popper/popper.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/lib/bootstrap/assets/javascripts/bootstrap.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/lib/bootstrap/assets/javascripts/bootstrap.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/js/javascript-templates/js/tmpl.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{$WWWROOT}/js/masonry/masonry.min.js?v={$CACHEVERSION}"></script>
<script type="application/javascript" src="{theme_url filename='js/pieform.js'}?v={$CACHEVERSION}"></script>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment