Skip to content

Commit e5522f8

Browse files
committed
make sure style get's loaded even when config is faulty
1 parent 255b945 commit e5522f8

File tree

2 files changed

+18
-20
lines changed

2 files changed

+18
-20
lines changed

acptemplates/mcodemirror.tpl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/search/searchcursor.js"></script>
66
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/search/search.js"></script>
77
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
8+
<script data-relocate="true">
9+
['{@$__wcf->getPath()}js/3rdParty/codemirror-mc/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/dialog/dialog.css'].forEach((href) => {
10+
const link = document.createElement('link');
11+
link.rel = 'stylesheet';
12+
link.href = href;
13+
document.head.appendChild(link);
14+
});
15+
</script>
816
{/if}
917
{if $codemirrorMode|isset}
1018
<script data-relocate="true">window.define.amd = undefined;</script>
@@ -26,19 +34,11 @@
2634
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/mode/xml/xml.js"></script>
2735
{/if}
2836
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
37+
{assign var='codemirrorLoaded' value=true}
2938
{/if}
3039
{event name='javascriptIncludes'}
3140

3241
<script data-relocate="true">
33-
{if !$codemirrorLoaded|isset}
34-
['{@$__wcf->getPath()}js/3rdParty/codemirror-mc/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/dialog/dialog.css'].forEach((href) => {
35-
const link = document.createElement('link');
36-
link.rel = 'stylesheet';
37-
link.href = href;
38-
document.head.appendChild(link);
39-
});
40-
{/if}
41-
4242
require(['EventHandler', 'Dom/Traverse', 'Dom/Util'], function(EventHandler, DomTraverse, DomUtil) {
4343
const elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
4444
const config = {
@@ -119,4 +119,3 @@
119119
});
120120
});
121121
</script>
122-
{assign var='codemirrorLoaded' value=true}

templates/mcodemirror.tpl

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@
55
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/search/searchcursor.js"></script>
66
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/search/search.js"></script>
77
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
8+
<script data-relocate="true">
9+
['{@$__wcf->getPath()}js/3rdParty/codemirror-mc/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/dialog/dialog.css'].forEach((href) => {
10+
const link = document.createElement('link');
11+
link.rel = 'stylesheet';
12+
link.href = href;
13+
document.head.appendChild(link);
14+
});
15+
</script>
816
{/if}
917
{if $codemirrorMode|isset}
1018
<script data-relocate="true">window.define.amd = undefined;</script>
@@ -26,19 +34,11 @@
2634
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror-mc/mode/xml/xml.js"></script>
2735
{/if}
2836
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
37+
{assign var='codemirrorLoaded' value=true}
2938
{/if}
3039
{event name='javascriptIncludes'}
3140

3241
<script data-relocate="true">
33-
{if !$codemirrorLoaded|isset}
34-
['{@$__wcf->getPath()}js/3rdParty/codemirror-mc/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror-mc/addon/dialog/dialog.css'].forEach((href) => {
35-
const link = document.createElement('link');
36-
link.rel = 'stylesheet';
37-
link.href = href;
38-
document.head.appendChild(link);
39-
});
40-
{/if}
41-
4242
require(['EventHandler', 'Dom/Traverse', 'Dom/Util'], function(EventHandler, DomTraverse, DomUtil) {
4343
const elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
4444
const config = {
@@ -119,4 +119,3 @@
119119
});
120120
});
121121
</script>
122-
{assign var='codemirrorLoaded' value=true}

0 commit comments

Comments
 (0)