Skip to content

Commit 72d7bcc

Browse files
committed
Modernize the JS a bit
1 parent fbd4799 commit 72d7bcc

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/assets/edit/dist/js/EditWebhook.js

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
(function($) {
22
/** global: Craft */
33
/** global: Garnish */
4-
var EditWebhook = Garnish.Base.extend(
4+
const EditWebhook = Garnish.Base.extend(
55
{
66
$nameInput: null,
77
$classInput: null,
@@ -24,10 +24,9 @@
2424
this.$filtersTable = $('#filters');
2525

2626
this.filters = {};
27-
var $filterRows = this.$filtersTable.find('tr');
28-
var filter;
29-
for (var i = 0; i < $filterRows.length; i++) {
30-
filter = new EditWebhook.Filter($filterRows.eq(i));
27+
const $filterRows = this.$filtersTable.find('tr');
28+
for (let i = 0; i < $filterRows.length; i++) {
29+
const filter = new EditWebhook.Filter($filterRows.eq(i));
3130
this.filters[filter.class] = filter;
3231
}
3332

@@ -37,12 +36,12 @@
3736
},
3837

3938
handleTextChange: function() {
40-
var input = this.$nameInput.get(0);
39+
const input = this.$nameInput.get(0);
4140

4241
// does it look like they just typed -> or => ?
4342
if (typeof input.selectionStart !== 'undefined' && input.selectionStart === input.selectionEnd) {
44-
var pos = input.selectionStart;
45-
var last2 = input.value.substring(pos - 2, pos);
43+
const pos = input.selectionStart;
44+
const last2 = input.value.substring(pos - 2, pos);
4645
if (last2 === '->' || last2 === '=>') {
4746
input.value = input.value.substring(0, pos - 2) + '➡️' + input.value.substring(pos);
4847
input.setSelectionRange(pos, pos);
@@ -51,8 +50,8 @@
5150
},
5251

5352
handleEventChange: function() {
54-
var classChanged = this.classVal !== (this.classVal = this.$classInput.val());
55-
var eventChanged = this.eventVal !== (this.eventVal = this.$eventInput.val());
53+
const classChanged = this.classVal !== (this.classVal = this.$classInput.val());
54+
const eventChanged = this.eventVal !== (this.eventVal = this.$eventInput.val());
5655
if (classChanged || eventChanged) {
5756
clearTimeout(this.filterTimeout);
5857
this.filterTimeout = setTimeout(this.updateFilters.bind(this), 500);
@@ -64,29 +63,30 @@
6463
return;
6564
}
6665
this.$filterSpinner.removeClass('hidden');
67-
Craft.postActionRequest('webhooks/webhooks/filters', {
68-
senderClass: this.classVal,
69-
event: this.eventVal,
70-
}, function(response, textStatus) {
71-
this.$filterSpinner.addClass('hidden');
72-
if (textStatus === 'success') {
73-
this.resetFilters();
74-
if (response.filters.length) {
75-
this.$noFiltersMessage.addClass('hidden');
76-
this.$filtersTable.removeClass('hidden');
77-
for (var i = 0; i < response.filters.length; i++) {
78-
this.filters[response.filters[i]].$tr.removeClass('hidden');
79-
}
80-
} else {
81-
this.$noFiltersMessage.removeClass('hidden');
82-
this.$filtersTable.addClass('hidden');
66+
Craft.sendActionRequest('POST', 'webhooks/webhooks/filters', {
67+
data: {
68+
senderClass: this.classVal,
69+
event: this.eventVal,
70+
}
71+
}).then(response => {
72+
this.resetFilters();
73+
if (response.data.filters.length) {
74+
this.$noFiltersMessage.addClass('hidden');
75+
this.$filtersTable.removeClass('hidden');
76+
for (let i = 0; i < response.data.filters.length; i++) {
77+
this.filters[response.data.filters[i]].$tr.removeClass('hidden');
8378
}
79+
} else {
80+
this.$noFiltersMessage.removeClass('hidden');
81+
this.$filtersTable.addClass('hidden');
8482
}
85-
}.bind(this));
83+
}).finally(() => {
84+
this.$filterSpinner.addClass('hidden');
85+
});
8686
},
8787

8888
resetFilters: function() {
89-
for (var filter in this.filters) {
89+
for (let filter in this.filters) {
9090
if (!this.filters.hasOwnProperty(filter)) {
9191
continue;
9292
}

0 commit comments

Comments
 (0)