mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 09:35:11 +00:00
Work supporting issue #411, add an optional priority (int) as a second arg to head_add_js to affect the load ordering, larger numbered priorities will be included after lower numbered ones. Default priority is 0.Note that we treat main.js differently and always add main.js to the page last, regardless of any other
ordering.
This commit is contained in:
parent
96cd63cf1a
commit
0e0a6f5f8d
1 changed files with 23 additions and 11 deletions
|
@ -593,26 +593,38 @@ function script_path() {
|
|||
return $scheme . '://' . $hostname;
|
||||
}
|
||||
|
||||
function head_add_js($src) {
|
||||
App::$js_sources[] = $src;
|
||||
function head_add_js($src, $priority = 0) {
|
||||
if(! is_array(App::$js_sources[$priority]))
|
||||
App::$js_sources[$priority] = array();
|
||||
App::$js_sources[$priority][] = $src;
|
||||
}
|
||||
|
||||
function head_remove_js($src) {
|
||||
function head_remove_js($src, $priority = 0) {
|
||||
|
||||
$index = array_search($src, App::$js_sources);
|
||||
$index = array_search($src, App::$js_sources[$priority]);
|
||||
if($index !== false)
|
||||
unset(App::$js_sources[$index]);
|
||||
unset(App::$js_sources[$priority][$index]);
|
||||
}
|
||||
|
||||
// We should probably try to register main.js with a high priority, but currently we handle it
|
||||
// separately and put it at the end of the html head block in case any other javascript is
|
||||
// added outside the head_add_js construct.
|
||||
|
||||
function head_get_js() {
|
||||
|
||||
logger('sources:' . print_r(App::$js_sources,true));
|
||||
$str = '';
|
||||
$sources = App::$js_sources;
|
||||
if(count($sources))
|
||||
if(App::$js_sources) {
|
||||
foreach(App::$js_sources as $sources) {
|
||||
if(count($sources)) {
|
||||
foreach($sources as $source) {
|
||||
if($source === 'main.js')
|
||||
if($src === 'main.js')
|
||||
continue;
|
||||
$str .= format_js_if_exists($source);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return $str;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue