js.inc (mrbs-1.9.4) | : | js.inc (mrbs-1.10.0) | ||
---|---|---|---|---|
skipping to change at line 15 | skipping to change at line 15 | |||
{ | { | |||
echo '<script src="'; | echo '<script src="'; | |||
$value = ($add_version) ? add_version($src) : $src; | $value = ($add_version) ? add_version($src) : $src; | |||
echo htmlspecialchars($value); | echo htmlspecialchars($value); | |||
echo "\"></script>\n"; | echo "\"></script>\n"; | |||
} | } | |||
global $view, $year, $month, $day, $area, $room; | global $view, $year, $month, $day, $area, $room; | |||
global $multisite, $site; | global $multisite, $site; | |||
global $debug; | global $debug; | |||
global $custom_js_url; | ||||
$page = this_page(false, '.php'); | $page = this_page(false, '.php'); | |||
// We need to construct a standard query string that can be passed to the *.js.p hp | // We need to construct a standard query string that can be passed to the *.js.p hp | |||
// pages. That's because some of the settings they use are area dependent. | // pages. That's because some of the settings they use are area dependent. | |||
// We also want the area to be in the query string so that the JavaScript page i s | // We also want the area to be in the query string so that the JavaScript page i s | |||
// cached if the area is the same and not otherwise. | // cached if the area is the same and not otherwise. | |||
$query_string = "area=$area"; | $query_string = "area=$area"; | |||
if ($multisite && isset($site) && ($site !== '')) | if ($multisite && isset($site) && ($site !== '')) | |||
skipping to change at line 113 | skipping to change at line 114 | |||
} | } | |||
// The day, week and month views do refresh by Ajax. | // The day, week and month views do refresh by Ajax. | |||
// We need the resizable bookings for the day and week views | // We need the resizable bookings for the day and week views | |||
if ($page == 'index') | if ($page == 'index') | |||
{ | { | |||
script("js/refresh.js.php?$query_string", true); | script("js/refresh.js.php?$query_string", true); | |||
script("js/resizable.js.php?$query_string", true); | script("js/resizable.js.php?$query_string", true); | |||
} | } | |||
// Include the HTML5 Shiv so that elements such as <header> etc can be styled in | if (isset($custom_js_url)) | |||
IE8 and below. | { | |||
script($custom_js_url, true); | ||||
} | ||||
// Include the HTML5 Shiv so that elements such as <header> etc. can be styled i | ||||
n IE8 and below. | ||||
// (Even though we don't support IE8 and below, we still need the HTML5 Shiv for styling the | // (Even though we don't support IE8 and below, we still need the HTML5 Shiv for styling the | |||
// page which says we don't support them!). | // page which says we don't support them!). | |||
echo "<!--[if lte IE 8]>\n"; | echo "<!--[if lte IE 8]>\n"; | |||
script(($debug) ? 'js/html5shiv.js' : 'js/html5shiv.min.js', true); | script(($debug) ? 'js/html5shiv.js' : 'js/html5shiv.min.js', true); | |||
echo "<![endif]-->\n"; | echo "<![endif]-->\n"; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 8 lines changed or added |