From 2a2436ecebc7eb490e7bbe34f62d975a60219f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maxime=20M=C3=A9riouma-Caron?= <maxime.meriouma@arcbees.com>
Date: Tue, 2 Feb 2016 14:36:59 -0500
Subject: [PATCH] Fix for #285 : ChosenValueListBox allowSingleDeselect not
 working as expected

---
 .../com/arcbees/chosen/client/ChosenImpl.java | 26 ++++++++++++-------
 .../chosen/client/gwt/ChosenListBox.java      |  9 ++++---
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java b/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
index e850e2a..7c8d93c 100644
--- a/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/ChosenImpl.java
@@ -92,7 +92,6 @@ public abstract class ChosenImpl {
     protected GQuery searchContainer;
     protected String defaultText;
     private GQuery $selectElement;
-    private boolean allowSingleDeselect;
     private GQuery container;
     private String containerId;
     private ChosenCss css;
@@ -594,9 +593,7 @@ protected void fireChosenChangeEventIfNotEqual(OptionItem item, String newValue,
 
     protected void addChoice(OptionItem item) {
         selectedItem.find("span").text(item.getText());
-        if (allowSingleDeselect) {
-            singleDeselectControlBuild();
-        }
+        singleDeselectControlBuild();
 
         selectedValues.clear();
     }
@@ -859,6 +856,13 @@ private boolean containerMouseUp(Event e) {
         return true;
     }
 
+    private SafeHtml createEmptyOption() {
+        SafeHtmlBuilder builder = new SafeHtmlBuilder();
+        builder.append(fromTrustedString("<option value=''></option>"));
+
+        return builder.toSafeHtml();
+    }
+
     private SafeHtml createOption(OptionItem item) {
         SafeHtmlBuilder builder = new SafeHtmlBuilder();
         builder.append(fromTrustedString("<option value='")).appendEscaped(item.getValue())
@@ -1086,6 +1090,7 @@ private void rebuildResultItems(boolean init) {
                 OptionItem optionItem = (OptionItem) item;
 
                 if (optionItem.isEmpty()) {
+                    optionsHtml.append(createEmptyOption());
                     continue;
                 }
 
@@ -1283,11 +1288,6 @@ public boolean f(Event e) {
         mouseOnContainer = false;
         resultsShowing = false;
 
-        NodeList<OptionElement> optionsList = selectElement.getOptions();
-        allowSingleDeselect =
-                options.isAllowSingleDeselect() && optionsList.getLength() > 0
-                        && "".equals(optionsList.getItem(0).getText());
-
         choices = 0;
 
         if (options.getResources() != null) {
@@ -1312,6 +1312,12 @@ public boolean f(Event e) {
         }
     }
 
+    private boolean isAllowSingleDeselect() {
+        NodeList<OptionElement> optionsList = selectElement.getOptions();
+        return options.isAllowSingleDeselect() && optionsList.getLength() > 0
+                && "".equals(optionsList.getItem(0).getText());
+    }
+
     private void setTabIndex() {
         String tabIndexProperty = $selectElement.attr(TABINDEX_PROPERTY);
         if (tabIndexProperty != null && tabIndexProperty.length() > 0) {
@@ -1385,7 +1391,7 @@ private void setup() {
     }
 
     private void singleDeselectControlBuild() {
-        if (allowSingleDeselect && selectedItem.find("abbr").isEmpty()) {
+        if (isAllowSingleDeselect() && selectedItem.find("abbr").isEmpty()) {
             selectedItem.find("span").first().after(
                     "<abbr class=\"" + css.searchChoiceClose() + " " + css.iconCross() + "\"></abbr>");
         }
diff --git a/plugin/src/main/java/com/arcbees/chosen/client/gwt/ChosenListBox.java b/plugin/src/main/java/com/arcbees/chosen/client/gwt/ChosenListBox.java
index 280e94e..8535024 100755
--- a/plugin/src/main/java/com/arcbees/chosen/client/gwt/ChosenListBox.java
+++ b/plugin/src/main/java/com/arcbees/chosen/client/gwt/ChosenListBox.java
@@ -330,14 +330,17 @@ public void forceRedraw() {
     }
 
     public GQuery getChosenElement() {
-        ChosenImpl impl = $(getElement()).data(CHOSEN_DATA_KEY,
-                ChosenImpl.class);
+        ChosenImpl impl = getChosenImpl();
         if (impl != null) {
             return impl.getContainer();
         }
         return $();
     }
 
+    protected ChosenImpl getChosenImpl() {
+        return $(getElement()).data(CHOSEN_DATA_KEY, ChosenImpl.class);
+    }
+
     public int getDisableSearchThreshold() {
         return options.getDisableSearchThreshold();
     }
@@ -405,7 +408,7 @@ public String getValue() {
      * @return the values of all selected options in an array
      */
     public String[] getValues() {
-        ChosenImpl impl = $(getElement()).data(CHOSEN_DATA_KEY, ChosenImpl.class);
+        ChosenImpl impl = getChosenImpl();
 
         if (impl != null) {
             List<String> selectedValues = impl.getSelectedValues();