Skip to content

Commit 7166935

Browse files
committed
Always pass in a blank object for arguments
This fixes an issue where preventing the default behaviour on some events would trigger an exception. This was bacause the event relay was expecting there to always be an object passed in for arguments, and this wasn't always the case. This closes select2#3431.
1 parent 8722ae2 commit 7166935

6 files changed

Lines changed: 15 additions & 15 deletions

File tree

src/js/select2/core.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ define([
274274

275275
this.on('query', function (params) {
276276
if (!self.isOpen()) {
277-
self.trigger('open');
277+
self.trigger('open', {});
278278
}
279279

280280
this.dataAdapter.query(params, function (data) {
@@ -304,19 +304,19 @@ define([
304304

305305
evt.preventDefault();
306306
} else if (key === KEYS.ENTER) {
307-
self.trigger('results:select');
307+
self.trigger('results:select', {});
308308

309309
evt.preventDefault();
310310
} else if ((key === KEYS.SPACE && evt.ctrlKey)) {
311-
self.trigger('results:toggle');
311+
self.trigger('results:toggle', {});
312312

313313
evt.preventDefault();
314314
} else if (key === KEYS.UP) {
315-
self.trigger('results:previous');
315+
self.trigger('results:previous', {});
316316

317317
evt.preventDefault();
318318
} else if (key === KEYS.DOWN) {
319-
self.trigger('results:next');
319+
self.trigger('results:next', {});
320320

321321
evt.preventDefault();
322322
}
@@ -339,9 +339,9 @@ define([
339339
this.close();
340340
}
341341

342-
this.trigger('disable');
342+
this.trigger('disable', {});
343343
} else {
344-
this.trigger('enable');
344+
this.trigger('enable', {});
345345
}
346346
};
347347

@@ -403,7 +403,7 @@ define([
403403
return;
404404
}
405405

406-
this.trigger('close');
406+
this.trigger('close', {});
407407
};
408408

409409
Select2.prototype.isOpen = function () {
@@ -421,7 +421,7 @@ define([
421421
}
422422

423423
this.$container.addClass('select2-container--focus');
424-
this.trigger('focus');
424+
this.trigger('focus', {});
425425
};
426426

427427
Select2.prototype.enable = function (args) {

src/js/select2/dropdown/closeOnSelect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ define([
2525
return;
2626
}
2727

28-
this.trigger('close');
28+
this.trigger('close', {});
2929
};
3030

3131
return CloseOnSelect;

src/js/select2/results.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ define([
305305
var data = $highlighted.data('data');
306306

307307
if ($highlighted.attr('aria-selected') == 'true') {
308-
self.trigger('close');
308+
self.trigger('close', {});
309309
} else {
310310
self.trigger('select', {
311311
data: data
@@ -427,7 +427,7 @@ define([
427427
data: data
428428
});
429429
} else {
430-
self.trigger('close');
430+
self.trigger('close', {});
431431
}
432432

433433
return;

src/js/select2/selection/allowClear.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ define([
6262

6363
this.$element.val(this.placeholder.id).trigger('change');
6464

65-
this.trigger('toggle');
65+
this.trigger('toggle', {});
6666
};
6767

6868
AllowClear.prototype._handleKeyboardClear = function (_, evt, container) {

src/js/select2/selection/clickMask.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define([
1313
);
1414

1515
this.$mask.on('mousedown touchstart click', function () {
16-
self.trigger('close');
16+
self.trigger('close', {});
1717
});
1818
};
1919

src/js/select2/selection/search.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ define([
184184
data: item
185185
});
186186

187-
this.trigger('open');
187+
this.trigger('open', {});
188188

189189
this.$search.val(item.text + ' ');
190190
};

0 commit comments

Comments
 (0)