Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow delayed loading of three.js #935

Merged
merged 3 commits into from
Jul 10, 2019
Merged

Allow delayed loading of three.js #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88b373e
Allow delayed loading of three.js
1v9 Jun 28, 2019
01f4ada
update
1v9 Jul 8, 2019
05a09eb
comment
1v9 Jul 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions _config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1000,12 +1000,12 @@ canvas_nest:

# JavaScript 3D library.
# Dependencies: https://github.com/theme-next/theme-next-three
# three_waves
three_waves: false
# canvas_lines
canvas_lines: false
# canvas_sphere
canvas_sphere: false
three:
enable: false
delay: false # Set true to further delay loading
three_waves: false
canvas_lines: false
canvas_sphere: false

# Canvas-ribbon
# Dependencies: https://github.com/theme-next/theme-next-canvas-ribbon
Expand Down
1 change: 1 addition & 0 deletions layout/_layout.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
{% include '_scripts/next-boot.swig' %}
{% include '_scripts/scroll-cookie.swig' %}
{% include '_scripts/exturl.swig' %}
{% include '_scripts/three.swig' %}
{% include '_third-party/quicklink.swig' %}
{% include '_third-party/comments/index.swig' %}
{% include '_third-party/search/index.swig' %}
Expand Down
40 changes: 40 additions & 0 deletions layout/_scripts/three.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{% if theme.three.enable and theme.three.delay %}
{% set three_url = url_for(theme.vendors._internal + '/three/three.min.js') %}
{% if theme.vendors.three %}
{% set three_url = theme.vendors.three %}
{% endif %}

{% if theme.three.three_waves %}
{% set waves = theme.vendors.three_waves | default(url_for(theme.vendors._internal + '/three/three-waves.min.js')) %}
{% endif %}

{% if theme.three.canvas_lines %}
{% set lines = theme.vendors.canvas_lines | default(url_for(theme.vendors._internal + '/three/canvas_lines.min.js')) %}
{% endif %}

{% if theme.three.canvas_sphere %}
{% set sphere = theme.vendors.canvas_sphere | default(url_for(theme.vendors._internal + '/three/canvas_sphere.min.js')) %}
{% endif %}

<script>
;((d, w) => {
loadThree = () => {
let s = d.createElement('script');
s.src = '{{ three_url }}';
d.body.appendChild(s);
}
let styles = ['{{ waves }}', '{{ lines }}', '{{ sphere }}'];
loadStyle = () => {
styles.forEach(x => {
if (x !== '') {
let s = d.createElement('script');
s.src = x;
d.body.appendChild(s);
}
})
}
w.addEventListener('DOMContentLoaded', loadThree);
w.addEventListener('load', loadStyle);
})(document, window);
</script>
{% endif %}
32 changes: 19 additions & 13 deletions layout/_scripts/vendors.swig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
</script>

{% set js_vendors = {} %}
{% set js_defer_vendors = {} %}
{% set js_vendors.jquery = 'jquery/index.js?v=3.4.1' %}

{% if theme.fastclick %}
Expand Down Expand Up @@ -39,19 +40,19 @@
<script color='{{ theme.canvas_nest.color }}' opacity='{{ theme.canvas_nest.opacity }}' zIndex='{{ theme.canvas_nest.zIndex }}' count='{{ theme.canvas_nest.count }}' src="{{ canvas_nest_uri }}"></script>
{% endif %}

{% if theme.three_waves %}
{% set js_vendors.three = 'three/three.min.js' %}
{% set js_vendors.three_waves = 'three/three-waves.min.js' %}
{% endif %}

{% if theme.canvas_lines %}
{% set js_vendors.three = 'three/three.min.js' %}
{% set js_vendors.canvas_lines = 'three/canvas_lines.min.js' %}
{% endif %}

{% if theme.canvas_sphere %}
{% set js_vendors.three = 'three/three.min.js' %}
{% set js_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %}
{% if theme.three.enable and not theme.three.delay %}
{% if theme.three.three_waves %}
{% set js_defer_vendors.three = 'three/three.min.js' %}
{% set js_defer_vendors.three_waves = 'three/three-waves.min.js' %}
{% endif %}
{% if theme.three.canvas_lines %}
{% set js_defer_vendors.three = 'three/three.min.js' %}
{% set js_defer_vendors.canvas_lines = 'three/canvas_lines.min.js' %}
{% endif %}
{% if theme.three.canvas_sphere %}
{% set js_defer_vendors.three = 'three/three.min.js' %}
{% set js_defer_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %}
{% endif %}
{% endif %}

{% if theme.canvas_ribbon.enable %}
Expand All @@ -70,3 +71,8 @@
{% set internal_script = url_for(theme.vendors._internal + '/' + internal) %}
<script src="{{ theme.vendors[name] | default(internal_script) }}"></script>
{% endfor %}

{% for name, internal in js_defer_vendors %}
{% set internal_script = url_for(theme.vendors._internal + '/' + internal) %}
<script defer src="{{ theme.vendors[name] | default(internal_script) }}"></script>
{% endfor %}