Skip to content

Commit e3ea82c

Browse files
committed
update templates
1 parent 8d319cd commit e3ea82c

File tree

2 files changed

+38
-40
lines changed

2 files changed

+38
-40
lines changed

acptemplates/codemirror.tpl

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{if $codemirrorMode|isset}
1010
<script data-relocate="true">window.define.amd = undefined;</script>
1111
{if $codemirrorMode != 'smartymixed'}
12-
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{if $codemirrorMode == 'text/x-less'}css/css{else}{$codemirrorMode}/{$codemirrorMode}{/if}.js"></script>
12+
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{if $codemirrorMode == 'text/x-less'}css/css{else}{$codemirrorMode}/{$codemirrorMode}{/if}.js"></script>
1313
{/if}
1414

1515
{if $codemirrorMode == 'htmlmixed' || $codemirrorMode == 'smartymixed' || $codemirrorMode == 'php'}
@@ -25,24 +25,23 @@
2525
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/javascript/javascript.js"></script>
2626
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/xml/xml.js"></script>
2727
{/if}
28-
2928
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
3029
{/if}
3130
{event name='javascriptIncludes'}
3231

3332
<script data-relocate="true">
3433
{if !$codemirrorLoaded|isset}
35-
['{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.css'].forEach(function(href) {
36-
var link = document.createElement('link');
34+
['{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.css'].forEach((href) => {
35+
const link = document.createElement('link');
3736
link.rel = 'stylesheet';
3837
link.href = href;
3938
document.head.appendChild(link);
4039
});
4140
{/if}
4241
4342
require(['EventHandler', 'Dom/Traverse', 'Dom/Util'], function(EventHandler, DomTraverse, DomUtil) {
44-
var elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
45-
var config = {
43+
const elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
44+
const config = {
4645
{if $codemirrorMode|isset}
4746
{if $codemirrorMode == 'smartymixed'}
4847
mode: {
@@ -61,59 +60,59 @@
6160
readOnly: {if !$editable|isset || $editable}false{else}true{/if}
6261
};
6362
64-
[].forEach.call(elements, function (element) {
63+
elements.forEach((element) => {
6564
{event name='javascriptInit'}
6665
6766
if (element.codemirror) {
68-
for (var key in config) {
67+
for (const key in config) {
6968
if (config.hasOwnProperty(key)) {
7069
element.codemirror.setOption(key, config[key]);
7170
}
7271
}
7372
}
7473
else {
7574
element.codemirror = CodeMirror.fromTextArea(element, config);
76-
var oldToTextArea = element.codemirror.toTextArea;
77-
element.codemirror.toTextArea = function () {
75+
const oldToTextArea = element.codemirror.toTextArea;
76+
element.codemirror.toTextArea = () => {
7877
oldToTextArea();
7978
element.codemirror = null;
8079
};
8180
}
8281
83-
setTimeout(function () {
82+
setTimeout(() => {
8483
element.codemirror.refresh();
8584
}, 250);
86-
setTimeout(function () {
85+
setTimeout(() => {
8786
element.codemirror.refresh();
8887
}, 1000);
8988
90-
var tab = DomTraverse.parentByClass(element, 'tabMenuContent');
89+
const tab = DomTraverse.parentByClass(element, 'tabMenuContent');
9190
if (tab !== null) {
92-
var name = elData(tab, 'name');
93-
var tabMenu = DomTraverse.parentByClass(tab, 'tabMenuContainer');
94-
var scrollPosition = null;
91+
const name = elData(tab, 'name');
92+
const tabMenu = DomTraverse.parentByClass(tab, 'tabMenuContainer');
93+
let scrollPosition = null;
9594
96-
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'select', function(data) {
95+
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'select', (data) => {
9796
if (data.activeName === name) {
9897
element.codemirror.refresh();
9998
if (scrollPosition !== null) element.codemirror.scrollTo(null, scrollPosition);
10099
}
101100
});
102101
103-
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'beforeSelect', function(data) {
102+
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'beforeSelect', (data) => {
104103
if (data.tabName === name) {
105104
scrollPosition = element.codemirror.getScrollInfo().top;
106105
}
107106
});
108107
}
109108
110-
var scrollOffsetStorage = element;
109+
let scrollOffsetStorage = element;
111110
do {
112111
scrollOffsetStorage = scrollOffsetStorage.nextElementSibling;
113112
} while (scrollOffsetStorage && !scrollOffsetStorage.classList.contains('codeMirrorScrollOffset'));
114113
if (scrollOffsetStorage) {
115114
element.codemirror.scrollTo(null, scrollOffsetStorage.value);
116-
element.codemirror.on('scroll', function (cm) {
115+
element.codemirror.on('scroll', (cm) => {
117116
scrollOffsetStorage.value = cm.getScrollInfo().top;
118117
});
119118
}

templates/codemirror.tpl

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{if $codemirrorMode|isset}
1010
<script data-relocate="true">window.define.amd = undefined;</script>
1111
{if $codemirrorMode != 'smartymixed'}
12-
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{if $codemirrorMode == 'text/x-less'}css/css{else}{$codemirrorMode}/{$codemirrorMode}{/if}.js"></script>
12+
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/{if $codemirrorMode == 'text/x-less'}css/css{else}{$codemirrorMode}/{$codemirrorMode}{/if}.js"></script>
1313
{/if}
1414

1515
{if $codemirrorMode == 'htmlmixed' || $codemirrorMode == 'smartymixed' || $codemirrorMode == 'php'}
@@ -25,24 +25,23 @@
2525
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/javascript/javascript.js"></script>
2626
<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/codemirror/mode/xml/xml.js"></script>
2727
{/if}
28-
2928
<script data-relocate="true">window.define.amd = window.__require_define_amd;</script>
3029
{/if}
3130
{event name='javascriptIncludes'}
3231

3332
<script data-relocate="true">
3433
{if !$codemirrorLoaded|isset}
35-
['{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.css'].forEach(function(href) {
36-
var link = document.createElement('link');
34+
['{@$__wcf->getPath()}js/3rdParty/codemirror/codemirror.css', '{@$__wcf->getPath()}js/3rdParty/codemirror/addon/dialog/dialog.css'].forEach((href) => {
35+
const link = document.createElement('link');
3736
link.rel = 'stylesheet';
3837
link.href = href;
3938
document.head.appendChild(link);
4039
});
4140
{/if}
4241
4342
require(['EventHandler', 'Dom/Traverse', 'Dom/Util'], function(EventHandler, DomTraverse, DomUtil) {
44-
var elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
45-
var config = {
43+
const elements = document.querySelectorAll('{@$codemirrorSelector|encodeJS}');
44+
const config = {
4645
{if $codemirrorMode|isset}
4746
{if $codemirrorMode == 'smartymixed'}
4847
mode: {
@@ -61,59 +60,59 @@
6160
readOnly: {if !$editable|isset || $editable}false{else}true{/if}
6261
};
6362
64-
[].forEach.call(elements, function (element) {
63+
elements.forEach((element) => {
6564
{event name='javascriptInit'}
6665
6766
if (element.codemirror) {
68-
for (var key in config) {
67+
for (const key in config) {
6968
if (config.hasOwnProperty(key)) {
7069
element.codemirror.setOption(key, config[key]);
7170
}
7271
}
7372
}
7473
else {
7574
element.codemirror = CodeMirror.fromTextArea(element, config);
76-
var oldToTextArea = element.codemirror.toTextArea;
77-
element.codemirror.toTextArea = function () {
75+
const oldToTextArea = element.codemirror.toTextArea;
76+
element.codemirror.toTextArea = () => {
7877
oldToTextArea();
7978
element.codemirror = null;
8079
};
8180
}
8281
83-
setTimeout(function () {
82+
setTimeout(() => {
8483
element.codemirror.refresh();
8584
}, 250);
86-
setTimeout(function () {
85+
setTimeout(() => {
8786
element.codemirror.refresh();
8887
}, 1000);
8988
90-
var tab = DomTraverse.parentByClass(element, 'tabMenuContent');
89+
const tab = DomTraverse.parentByClass(element, 'tabMenuContent');
9190
if (tab !== null) {
92-
var name = elData(tab, 'name');
93-
var tabMenu = DomTraverse.parentByClass(tab, 'tabMenuContainer');
94-
var scrollPosition = null;
91+
const name = elData(tab, 'name');
92+
const tabMenu = DomTraverse.parentByClass(tab, 'tabMenuContainer');
93+
let scrollPosition = null;
9594
96-
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'select', function(data) {
95+
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'select', (data) => {
9796
if (data.activeName === name) {
9897
element.codemirror.refresh();
9998
if (scrollPosition !== null) element.codemirror.scrollTo(null, scrollPosition);
10099
}
101100
});
102101
103-
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'beforeSelect', function(data) {
102+
EventHandler.add('com.woltlab.wcf.simpleTabMenu_' + DomUtil.identify(tabMenu), 'beforeSelect', (data) => {
104103
if (data.tabName === name) {
105104
scrollPosition = element.codemirror.getScrollInfo().top;
106105
}
107106
});
108107
}
109108
110-
var scrollOffsetStorage = element;
109+
let scrollOffsetStorage = element;
111110
do {
112111
scrollOffsetStorage = scrollOffsetStorage.nextElementSibling;
113112
} while (scrollOffsetStorage && !scrollOffsetStorage.classList.contains('codeMirrorScrollOffset'));
114113
if (scrollOffsetStorage) {
115114
element.codemirror.scrollTo(null, scrollOffsetStorage.value);
116-
element.codemirror.on('scroll', function (cm) {
115+
element.codemirror.on('scroll', (cm) => {
117116
scrollOffsetStorage.value = cm.getScrollInfo().top;
118117
});
119118
}

0 commit comments

Comments
 (0)