RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-18 04:53:15 +03:00
Code Issues Projects Releases Wiki Activity

Fix value not being cleared when unselect event is emitted

Browse Source 
Fixes #5049.
This commit is contained in:
Krzysztof Śmiałek 2017-09-26 16:20:08 +02:00 committed by alexweissman
parent 43ffaea244
commit 10bda78b37
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/js/select2/selection/allowClear.js vendored
View File

@ -45,6 +45,9 @@ define([
var data = $clear.data('data'); var data = $clear.data('data');
var previousVal = this.$element.val();
this.$element.val(this.placeholder.id);
for (var d = 0; d < data.length; d++) { for (var d = 0; d < data.length; d++) {
var unselectData = { var unselectData = {
data: data[d] data: data[d]
@ -56,11 +59,12 @@ define([
// If the event was prevented, don't clear it out. // If the event was prevented, don't clear it out.
if (unselectData.prevented) { if (unselectData.prevented) {
this.$element.val(previousVal);
return; return;
} }
} }
this.$element.val(this.placeholder.id).trigger('change'); this.$element.trigger('change');
this.trigger('toggle', {}); this.trigger('toggle', {});
}; };

22
tests/selection/allowClear-tests.js
View File

@ -43,7 +43,7 @@ test('clear is not displayed for single placeholder', function (assert) {
test('clear is not displayed for multiple placeholder', function (assert) { test('clear is not displayed for multiple placeholder', function (assert) {
var selection = new AllowClearPlaceholder( var selection = new AllowClearPlaceholder(
$('#qunit-fixture .single-with-placeholder'), $('#qunit-fixture .multiple'),
allowClearOptions allowClearOptions
); );
@ -90,7 +90,7 @@ test('clicking clear will set the placeholder value', function (assert) {
var $selection = selection.render(); var $selection = selection.render();
selection.bind(container, $('<div></div')); selection.bind(container, $('<div></div>'));
$element.val('One'); $element.val('One');
selection.update([{ selection.update([{
@ -109,7 +109,7 @@ test('clicking clear will set the placeholder value', function (assert) {
}); });
test('clicking clear will trigger the unselect event', function (assert) { test('clicking clear will trigger the unselect event', function (assert) {
assert.expect(3); assert.expect(4);
var $element = $('#qunit-fixture .single-with-placeholder'); var $element = $('#qunit-fixture .single-with-placeholder');
@ -121,7 +121,7 @@ test('clicking clear will trigger the unselect event', function (assert) {
var $selection = selection.render(); var $selection = selection.render();
selection.bind(container, $('<div></div')); selection.bind(container, $('<div></div>'));
$element.val('One'); $element.val('One');
selection.update([{ selection.update([{
@ -143,7 +143,13 @@ test('clicking clear will trigger the unselect event', function (assert) {
assert.equal( assert.equal(
ev.data.id, ev.data.id,
'One', 'One',
'The previous object should be unselected' 'The data should be the unselected object'
);
assert.equal(
$element.val(),
'placeholder',
'The previous value should be unselected'
); );
}); });
@ -151,8 +157,6 @@ test('clicking clear will trigger the unselect event', function (assert) {
$remove.trigger('mousedown'); $remove.trigger('mousedown');
}); });
test('preventing the unselect event cancels the clearing', function (assert) { test('preventing the unselect event cancels the clearing', function (assert) {
var $element = $('#qunit-fixture .single-with-placeholder'); var $element = $('#qunit-fixture .single-with-placeholder');
@ -164,7 +168,7 @@ test('preventing the unselect event cancels the clearing', function (assert) {
var $selection = selection.render(); var $selection = selection.render();
selection.bind(container, $('<div></div')); selection.bind(container, $('<div></div>'));
$element.val('One'); $element.val('One');
selection.update([{ selection.update([{
@ -197,7 +201,7 @@ test('clear does not work when disabled', function (assert) {
var $selection = selection.render(); var $selection = selection.render();
selection.bind(container, $('<div></div')); selection.bind(container, $('<div></div>'));
selection.update([{ selection.update([{
id: 'One', id: 'One',