aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xboot.php4
-rwxr-xr-xinclude/plugin.php16
2 files changed, 19 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 5b6cea8b2..e5166b5f2 100755
--- a/boot.php
+++ b/boot.php
@@ -986,6 +986,10 @@ class App {
'$js_strings' => js_strings(),
'$zid' => get_my_address(),
)) . $this->page['htmlhead'];
+
+ // always put main.js at the end
+ $this->page['htmlhead'] .= head_get_main_js();
+
}
/**
diff --git a/include/plugin.php b/include/plugin.php
index ace00d43a..5c425ac58 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -573,11 +573,25 @@ function head_get_js() {
$str = '';
$sources = get_app()->js_sources;
if(count($sources))
- foreach($sources as $source)
+ foreach($sources as $source) {
+ if($source === 'main.js')
+ continue;
$str .= format_js_if_exists($source);
+ }
+ return $str;
+}
+
+function head_get_main_js() {
+ $str = '';
+ $sources = array('main.js');
+ if(count($sources))
+ foreach($sources as $source)
+ $str .= format_js_if_exists($source,true);
return $str;
}
+
+
function format_js_if_exists($source) {
if(strpos($source,'/') !== false)