Skip to content

Commit 5777f96

Browse files
committed
Switch to craft.transcoder.registerJsModules & craft.transcoder.registerCssModules
Signed-off-by: Andrew Welch <andrew@nystudio107.com>
1 parent 43f419d commit 5777f96

File tree

3 files changed

+8
-24
lines changed

3 files changed

+8
-24
lines changed

src/templates/_includes/macros.twig

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,3 @@
66
{{ false }}
77
{%- endif -%}
88
{%- endmacro %}
9-
10-
{% macro registerJsModules(jsModules) -%}
11-
{% set includeJsModules = [] %}
12-
{% for jsModule in jsModules %}
13-
{% set includeJsModules = includeJsModules | merge([craft.transcoder.getModuleUri(jsModule) ?? '']) %}
14-
{% endfor %}
15-
{% for jsModule in includeJsModules if jsModule %}
16-
{% do view.registerJsFile(jsModule, {
17-
'depends': 'nystudio107\\transcoder\\assetbundles\\transcoder\\TranscoderAsset'
18-
}) %}
19-
{% endfor %}
20-
{%- endmacro %}
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
{% extends "_layouts/cp" %}
22

3-
{% from 'transcoder/_includes/macros.twig' import registerJsModules %}
4-
53
{% block head %}
64
{{ parent() }}
7-
{{ craft.transcoder.includeCssModule("styles.css", false) }}
8-
{{ craft.transcoder.includeCssModule("vendors.css", false) }}
5+
{{ craft.transcoder.registerCssModules([
6+
'vendors.css',
7+
'styles.css',
8+
]) }}
99
{% endblock %}
1010

1111
{% block foot %}
1212
{{ parent() }}
13-
{% set jsModules = [
13+
{{ craft.transcoder.registerJsModules([
1414
'runtime.js',
1515
'vendors.js',
1616
'transcoder.js',
17-
] %}
18-
{{ registerJsModules(jsModules) }}
17+
]) }}
1918
{% endblock %}

src/templates/welcome.twig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{# @var craft \craft\web\twig\variables\CraftVariable #}
22
{% extends 'transcoder/_layouts/transcoder-cp.twig' %}
33

4-
{% from "transcoder/_includes/macros.twig" import registerJsModules %}
5-
64
{% set title = 'Welcome to Transcoder!' %}
75

86
{% set docsUrl = "https://github.com/nystudio107/craft-transcoder/blob/v1/README.md" %}
@@ -42,8 +40,7 @@
4240

4341
{% block foot %}
4442
{{ parent() }}
45-
{% set jsModules = [
43+
{{ craft.transcoder.registerJsModules([
4644
'welcome.js',
47-
] %}
48-
{{ registerJsModules(jsModules) }}
45+
]) }}
4946
{% endblock %}

0 commit comments

Comments
 (0)