Commit 6e76cc97 authored by Cecilia Vela Gurovic's avatar Cecilia Vela Gurovic Committed by Robert Lyon
Browse files

Bug 1868916: error syntax in blocks js

behatnotneeded

Change-Id: Id7c3169cbe1594c863e33b065fe6ea9cbad7e3f7
parent 81ecd263
......@@ -72,7 +72,7 @@ class PluginBlocktypeGallery extends MaharaCoreBlocktype {
'initjs' => " $('.js-masonry.thumbnails').masonry({ itemSelector: '.thumb' });"
),
array(
'file' => '',
'file' => get_config('wwwroot') . 'lib/bootstrap/assets/javascripts/bootstrap.min.js',
'initjs' => "$('#slideshow{$blockid}').on('slid.bs.carousel', function () {
$(window).trigger('colresize');
});"
......
......@@ -2112,7 +2112,7 @@ class BlockInstance {
foreach ($jsfiles as $jsfile) {
if (is_array($jsfile) && empty($jsfile['file']) && !empty($jsfile['initjs'])) {
// Just dealing with initjs option only so do this on page load
$js .= "jQuery(function() {\n" . $jsfile['initjs'] . "\n})";
$js .= "jQuery(function() {\n" . $jsfile['initjs'] . "\n});";
}
else {
$file = (is_array($jsfile) && !empty($jsfile['file'])) ? $jsfile['file'] : $jsfile;
......
Markdown is supported
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