|
@@ -167,12 +167,14 @@ test('duplicates - single - same id on select triggers change',
|
|
var data = new SelectData($select, data);
|
|
var data = new SelectData($select, data);
|
|
var second = $('#qunit-fixture .duplicates option')[2];
|
|
var second = $('#qunit-fixture .duplicates option')[2];
|
|
|
|
|
|
- var changeTriggered = false;
|
|
|
|
|
|
+ var changeTriggered = false, inputTriggered = false;
|
|
|
|
|
|
assert.equal($select.val(), 'one');
|
|
assert.equal($select.val(), 'one');
|
|
|
|
|
|
$select.on('change', function () {
|
|
$select.on('change', function () {
|
|
- changeTriggered = true;
|
|
|
|
|
|
+ changeTriggered = inputTriggered;
|
|
|
|
+ }).on('input', function() {
|
|
|
|
+ inputTriggered = true;
|
|
});
|
|
});
|
|
|
|
|
|
data.select({
|
|
data.select({
|
|
@@ -187,9 +189,14 @@ test('duplicates - single - same id on select triggers change',
|
|
'The value never changed'
|
|
'The value never changed'
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+ assert.ok(
|
|
|
|
+ inputTriggered,
|
|
|
|
+ 'The input event should be triggered'
|
|
|
|
+ );
|
|
|
|
+
|
|
assert.ok(
|
|
assert.ok(
|
|
changeTriggered,
|
|
changeTriggered,
|
|
- 'The change event should be triggered'
|
|
|
|
|
|
+ 'The change event should be triggered after the input event'
|
|
);
|
|
);
|
|
|
|
|
|
assert.ok(
|
|
assert.ok(
|
|
@@ -205,12 +212,14 @@ test('duplicates - single - different id on select triggers change',
|
|
var data = new SelectData($select, data);
|
|
var data = new SelectData($select, data);
|
|
var second = $('#qunit-fixture .duplicates option')[2];
|
|
var second = $('#qunit-fixture .duplicates option')[2];
|
|
|
|
|
|
- var changeTriggered = false;
|
|
|
|
|
|
+ var changeTriggered = false, inputTriggered = false;
|
|
|
|
|
|
$select.val('two');
|
|
$select.val('two');
|
|
|
|
|
|
$select.on('change', function () {
|
|
$select.on('change', function () {
|
|
- changeTriggered = true;
|
|
|
|
|
|
+ changeTriggered = inputTriggered;
|
|
|
|
+ }).on('input', function() {
|
|
|
|
+ inputTriggered = true;
|
|
});
|
|
});
|
|
|
|
|
|
data.select({
|
|
data.select({
|
|
@@ -225,9 +234,14 @@ test('duplicates - single - different id on select triggers change',
|
|
'The value changed to the duplicate id'
|
|
'The value changed to the duplicate id'
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+ assert.ok(
|
|
|
|
+ inputTriggered,
|
|
|
|
+ 'The input event should be triggered'
|
|
|
|
+ );
|
|
|
|
+
|
|
assert.ok(
|
|
assert.ok(
|
|
changeTriggered,
|
|
changeTriggered,
|
|
- 'The change event should be triggered'
|
|
|
|
|
|
+ 'The change event should be triggered after the input event'
|
|
);
|
|
);
|
|
|
|
|
|
assert.ok(
|
|
assert.ok(
|
|
@@ -243,12 +257,14 @@ function (assert) {
|
|
var data = new SelectData($select, data);
|
|
var data = new SelectData($select, data);
|
|
var second = $('#qunit-fixture .duplicates-multi option')[2];
|
|
var second = $('#qunit-fixture .duplicates-multi option')[2];
|
|
|
|
|
|
- var changeTriggered = false;
|
|
|
|
|
|
+ var changeTriggered = false, inputTriggered = false;
|
|
|
|
|
|
$select.val(['one']);
|
|
$select.val(['one']);
|
|
|
|
|
|
$select.on('change', function () {
|
|
$select.on('change', function () {
|
|
- changeTriggered = true;
|
|
|
|
|
|
+ changeTriggered = inputTriggered;
|
|
|
|
+ }).on('input', function() {
|
|
|
|
+ inputTriggered = true;
|
|
});
|
|
});
|
|
|
|
|
|
data.select({
|
|
data.select({
|
|
@@ -263,9 +279,14 @@ function (assert) {
|
|
'The value now has duplicates'
|
|
'The value now has duplicates'
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+ assert.ok(
|
|
|
|
+ inputTriggered,
|
|
|
|
+ 'The input event should be triggered'
|
|
|
|
+ );
|
|
|
|
+
|
|
assert.ok(
|
|
assert.ok(
|
|
changeTriggered,
|
|
changeTriggered,
|
|
- 'The change event should be triggered'
|
|
|
|
|
|
+ 'The change event should be triggered after the input event'
|
|
);
|
|
);
|
|
|
|
|
|
assert.ok(
|
|
assert.ok(
|
|
@@ -281,12 +302,14 @@ function (assert) {
|
|
var data = new SelectData($select, data);
|
|
var data = new SelectData($select, data);
|
|
var second = $('#qunit-fixture .duplicates-multi option')[2];
|
|
var second = $('#qunit-fixture .duplicates-multi option')[2];
|
|
|
|
|
|
- var changeTriggered = false;
|
|
|
|
|
|
+ var changeTriggered = false, inputTriggered = false;
|
|
|
|
|
|
$select.val(['two']);
|
|
$select.val(['two']);
|
|
|
|
|
|
$select.on('change', function () {
|
|
$select.on('change', function () {
|
|
- changeTriggered = true;
|
|
|
|
|
|
+ changeTriggered = inputTriggered;
|
|
|
|
+ }).on('input', function() {
|
|
|
|
+ inputTriggered = true;
|
|
});
|
|
});
|
|
|
|
|
|
data.select({
|
|
data.select({
|
|
@@ -301,9 +324,14 @@ function (assert) {
|
|
'The value has the new id'
|
|
'The value has the new id'
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+ assert.ok(
|
|
|
|
+ inputTriggered,
|
|
|
|
+ 'The input event should be triggered'
|
|
|
|
+ );
|
|
|
|
+
|
|
assert.ok(
|
|
assert.ok(
|
|
changeTriggered,
|
|
changeTriggered,
|
|
- 'The change event should be triggered'
|
|
|
|
|
|
+ 'The change event should be triggered after the input event'
|
|
);
|
|
);
|
|
|
|
|
|
assert.ok(
|
|
assert.ok(
|