From afd47f9b12dc3adb6eb40c95143ec2ce2008bcc6 Mon Sep 17 00:00:00 2001
From: Josh Johnson <josh@joshuajohnson.co.uk>
Date: Mon, 10 Apr 2017 09:19:36 +0100
Subject: [PATCH] Rebase with master

---
 assets/scripts/src/choices.js |  5 ++++-
 index.html                    | 11 ++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/assets/scripts/src/choices.js b/assets/scripts/src/choices.js
index 58d97a4..e339220 100644
--- a/assets/scripts/src/choices.js
+++ b/assets/scripts/src/choices.js
@@ -1229,7 +1229,10 @@ class Choices {
         // Check flag to filter search input
         if (this.config.searchChoices) {
           // Filter available choices
-          this._searchChoices(value);
+          const results = this._searchChoices(value);
+          if (results) {
+            this.store.dispatch(filterChoices(results));
+          }
         }
         // Trigger search event
         triggerEvent(this.passedElement, 'search', {
diff --git a/index.html b/index.html
index d61dbfc..fbb46d4 100644
--- a/index.html
+++ b/index.html
@@ -152,8 +152,8 @@
       <hr>
 
       <h2>Single select input</h2>
-      <label for="choices-single-default">Default</label>
-      <select class="form-control" data-trigger name="choices-single-default" id="choices-single-default" placeholder="This is a search placeholder">
+      <label for="choices-single-placeholder">Default</label>
+      <select class="form-control" data-trigger name="choices-single-placeholder" id="choices-single-placeholder" placeholder="This is a search placeholder">
         <option selected disabled>This is a placeholder</option>
         <option value="Dropdown item 1">Dropdown item 1</option>
         <option value="Dropdown item 2">Dropdown item 2</option>
@@ -348,7 +348,6 @@
         removeItemButton: true,
       });
 
-<<<<<<< HEAD
       /* Use label on event */
       var choicesSelect = new Choices('#choices-multiple-labels', {
         search: false,
@@ -370,13 +369,15 @@
 
       choicesSelect.passedElement.addEventListener('removeItem', function(event) {
         document.getElementById('message').innerHTML = 'You just removed "' + event.detail.label + '"';
-=======
+      });
+
       var multipleAddItems = new Choices('#choices-multiple-add-items', {
         addItems: true,
         duplicateItems: false,
->>>>>>> c348050... Add multiple select example
       });
 
+      var multipleAddItems = new Choices('#choices-single-placeholder');
+
       var singleFetch = new Choices('#choices-single-remote-fetch', {
         placeholder: true,
         placeholderValue: 'Pick an Arctic Monkeys record'