leftypol
/
leftypol
4
5
Fork 2
Code Issues 55 Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Refactor deferred js

pull/40/head
nonmakina 3 years ago
parent
c02d3f17fa
commit
44d8d2d0d5
4 changed files with 38 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      inc/config.php
  2. 2
      inc/functions.php
  3. 58
      inc/instance-config.php
  4. 4
      templates/header.html

11
inc/config.php
View File

@ -1053,10 +1053,13 @@
// $config['additional_javascript'][] = 'js/style-select.js';
// Defer some additional Javascript for faster initial page load times. Defering may break some scripts.
// To enable, replace the $config['additional_javascript'] array with $config['additional_javascript_init']
// and $config['additional_javascript_defer'] arrays, then merge them to with array_merge() to generate
// the $config['additional_javascript'] array. This is incompatible with additional_javascript_compile.
// Remember to add the two scripts above into ['additional_javascript_init']!
// To enable, set this to true and add the scripts you want to defer to $config['additional_javascript_defer'].
// If using $config['additional_javascript_compile'], this will be ignored and no files will be deferred.
// eg.
// inc/instance-config.php:
// $config['deferred_javascript'] = true;
// $config['additional_javascript_defer'][] = 'js/style-select.js';
$config['additional_javascript_defer'] = [];
$config['deferred_javascript'] = false;
// Where these script files are located on the web. Defaults to $config['root'].

2
inc/functions.php
View File

@ -1737,7 +1737,7 @@ function buildJavascript() {
}
if ($config['additional_javascript_compile']) {
foreach ($config['additional_javascript'] as $file) {
foreach (array_merge($config['additional_javascript'], $config['additional_javascript_defer']) as $file) {
$script .= file_get_contents($file);
}
}

58
inc/instance-config.php
View File

@ -372,46 +372,44 @@ $config['default_stylesheet'] = array('Dark Red', $config['stylesheets']['Dark R
*/
$config['deferred_javascript'] = true;
$config['additional_javascript_init'][] = 'js/jquery.min.js';
$config['additional_javascript_init'][] = 'js/inline-expanding.js';
$config['additional_javascript_init'][] = 'js/ajax.js';
$config['additional_javascript_init'][] = 'js/post-menu.js';
$config['additional_javascript_init'][] = 'js/hide-images.js';
$config['additional_javascript_init'][] = 'js/show-backlinks.js';
$config['additional_javascript_init'][] = 'js/show-op.js';
$config['additional_javascript_init'][] = 'js/show-own-posts.js';
$config['additional_javascript_init'][] = 'js/post-filter.js';
$config['additional_javascript_init'][] = 'js/strftime.min.js';
$config['additional_javascript_init'][] = 'js/local-time.js';
$config['additional_javascript_init'][] = 'js/save-user_flag.js';
$config['additional_javascript_init'][] = 'js/auto-scroll.js';
$config['additional_javascript_init'][] = 'js/options.js';
$config['additional_javascript_init'][] = 'js/options/general.js';
$config['additional_javascript_init'][] = 'js/options/user-css.js';
$config['additional_javascript_init'][] = 'js/options/user-js.js';
$config['additional_javascript_init'][] = 'js/style-select.js';
$config['additional_javascript_init'][] = 'js/flag-preview.js';
$config['additional_javascript_init'][] = 'js/file-selector.js';
$config['additional_javascript_init'][] = 'js/post-hover.js';
$config['additional_javascript_init'][] = 'js/download-original.js';
$config['additional_javascript'][] = 'js/jquery.min.js';
$config['additional_javascript'][] = 'js/inline-expanding.js';
$config['additional_javascript'][] = 'js/ajax.js';
$config['additional_javascript'][] = 'js/post-menu.js';
$config['additional_javascript'][] = 'js/hide-images.js';
$config['additional_javascript'][] = 'js/show-backlinks.js';
$config['additional_javascript'][] = 'js/show-op.js';
$config['additional_javascript'][] = 'js/show-own-posts.js';
$config['additional_javascript'][] = 'js/post-filter.js';
$config['additional_javascript'][] = 'js/strftime.min.js';
$config['additional_javascript'][] = 'js/local-time.js';
$config['additional_javascript'][] = 'js/save-user_flag.js';
$config['additional_javascript'][] = 'js/auto-scroll.js';
$config['additional_javascript'][] = 'js/options.js';
$config['additional_javascript'][] = 'js/options/general.js';
$config['additional_javascript'][] = 'js/options/user-css.js';
$config['additional_javascript'][] = 'js/options/user-js.js';
$config['additional_javascript'][] = 'js/style-select.js';
$config['additional_javascript'][] = 'js/flag-preview.js';
$config['additional_javascript'][] = 'js/file-selector.js';
$config['additional_javascript'][] = 'js/post-hover.js';
$config['additional_javascript'][] = 'js/download-original.js';
$config['additional_javascript_defer'][] = 'js/auto-reload.js';
$config['additional_javascript_defer'][] = 'js/thread-stats.js';
$config['additional_javascript_defer'][] = 'js/image-hover.js';
$config['additional_javascript_init'][] = 'js/jquery-ui.custom.min.js';
$config['additional_javascript_init'][] = 'js/quick-reply.js';
$config['additional_javascript'][] = 'js/jquery-ui.custom.min.js';
$config['additional_javascript'][] = 'js/quick-reply.js';
$config['additional_javascript_init'][] = 'js/gallery-view.js';
$config['additional_javascript_init'][] = 'js/catalog-search.js';
$config['additional_javascript'][] = 'js/gallery-view.js';
$config['additional_javascript'][] = 'js/catalog-search.js';
$config['additional_javascript_defer'][] = 'js/thread-watcher.js';
$config['additional_javascript_defer'][] = 'js/expand.js';
$config['additional_javascript_defer'][] = 'js/webm-settings.js';
$config['additional_javascript_defer'][] = 'js/expand-video.js';
$config['additional_javascript'] = array_merge($config['additional_javascript_init'], $config['additional_javascript_defer']);
$config['flag_preview'] = true;
$config['enable_embedding'] = true;

4
templates/header.html
View File

@ -18,9 +18,9 @@
<script type="text/javascript" src="{{ config.url_javascript }}"></script>
{% if not config.additional_javascript_compile %}
{% if not config.deferred_javascript %}
{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
{% for javascript in config.additional_javascript|merge(config.additional_javascript_defer) %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
{% else %}
{% for javascript in config.additional_javascript_init %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
{% for javascript in config.additional_javascript %}<script type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
{% for javascript in config.additional_javascript_defer %}<script defer type="text/javascript" src="{{ config.additional_javascript_url }}{{ javascript }}"></script>{% endfor %}
{% endif %}
{% endif %}

Write Preview
Loading…
Cancel
Save