Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/search-select-all' into …
Browse files Browse the repository at this point in the history
…feature/search-select-all
  • Loading branch information
Jorik Kraaikamp committed Dec 8, 2017
2 parents 16a38e3 + c154e77 commit 8ac6400
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ <h2 class="subtitle">Add options and add eventListeners <span class="source" dat
searchPlaceholder: 'search numbers'
});
dlb2.addEventListener('added', function(event){
document.querySelector('.changed-element').innerHTML = event.addedElement.outerHTML;
document.querySelector('.changed-element').innerHTML = event.target.outerHTML;
});
dlb2.addEventListener('removed', function(event){
document.querySelector('.changed-element').innerHTML = event.removedElement.outerHTML;
document.querySelector('.changed-element').innerHTML = event.target.outerHTML;
});

var sources = document.querySelectorAll('.source');
Expand Down
4 changes: 2 additions & 2 deletions src/dual-listbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class DualListbox {

let event = document.createEvent("HTMLEvents");
event.initEvent("added", false, true);
event.addedElement = listItem;
event.target = listItem;
this.dualListbox.dispatchEvent(event);
}
}
Expand Down Expand Up @@ -108,7 +108,7 @@ class DualListbox {

let event = document.createEvent("HTMLEvents");
event.initEvent("removed", false, true);
event.removedElement = listItem;
event.target = listItem;
this.dualListbox.dispatchEvent(event);
}
}
Expand Down
6 changes: 3 additions & 3 deletions test/dual-listbox.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ describe('Duallistbox', function () {
expect(dlb.selected.length).toBe(3);

dlb.addEventListener('removed', event => {
expect(event.removedElement.innerText).toBe('Two');
expect(event.target.innerText).toBe('Two');
done();
});

Expand All @@ -429,7 +429,7 @@ describe('Duallistbox', function () {
dlb._actionItemDeselected(event);
});

it('should be able to add the removed eventListener', (done) => {
it('should be able to add the added eventListener', (done) => {
let domParent = document.createElement("div");
domParent.innerHTML = FIXTURE_FILLED_SELECT_PRESELECTED_MULTIPLE;

Expand All @@ -438,7 +438,7 @@ describe('Duallistbox', function () {
expect(dlb.selected.length).toBe(3);

dlb.addEventListener('added', event => {
expect(event.addedElement.innerText).toBe('One');
expect(event.target.innerText).toBe('One');
done();
});

Expand Down

0 comments on commit 8ac6400

Please sign in to comment.