From 267d948b345966fbf21c7ce63e4ca02f0a5f04e1 Mon Sep 17 00:00:00 2001
From: jlukic <jacklukic@gmail.com>
Date: Thu, 26 Mar 2015 18:29:32 -0400
Subject: [PATCH] Fix some placeholder text cases with multiple

---
 src/definitions/modules/dropdown.js | 35 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
index bbd8ffd25..b5f30d03c 100644
--- a/src/definitions/modules/dropdown.js
+++ b/src/definitions/modules/dropdown.js
@@ -495,7 +495,7 @@ $.fn.dropdown = function(parameters) {
         },
 
         focusSearch: function() {
-          if( module.is.search() ) {
+          if( module.is.search() && !module.is.focusedOnSearch() ) {
             $search
               .focus()
             ;
@@ -1294,18 +1294,23 @@ $.fn.dropdown = function(parameters) {
         set: {
           filtered: function() {
             var
-              searchValue    = $search.val(),
-              searchWidth    = ((searchValue.length) * settings.glyphWidth) + 'em',
-              hasSearchValue = (typeof searchValue === 'string' && searchValue.length > 0)
+              isMultiple      = module.is.multiple(),
+              searchValue     = $search.val(),
+              hasSearchValue  = (typeof searchValue === 'string' && searchValue.length > 0),
+              searchWidth     = (searchValue.length * settings.glyphWidth) + 'em',
+              valueIsSet      = $input.val() != ''
             ;
-            if(hasSearchValue) {
+            if(isMultiple && hasSearchValue) {
+              module.verbose('Adjusting input width', searchWidth, settings.glyphWidth)
+              $search.css('width', searchWidth);
+            }
+
+            if(hasSearchValue || (isMultiple && valueIsSet)) {
+              module.verbose('Hiding placeholder text');
               $text.addClass(className.filtered);
-              if(module.is.multiple()) {
-                module.verbose('Adjusting input width', searchWidth, settings.glyphWidth)
-                $search.css('width', searchWidth);
-              }
             }
-            else if( !module.is.multiple() || module.is.multiple() && $input.val() == '') {
+            else if(!isMultiple || (isMultiple && !valueIsSet)) {
+              module.verbose('Showing placeholder text');
               $text.removeClass(className.filtered);
             }
           },
@@ -1483,11 +1488,13 @@ $.fn.dropdown = function(parameters) {
                   selectedValue = module.get.choiceValue($selected, selectedText);
                   if(isMultiple) {
                     module.add.label(selectedValue, selectedText, shouldAnimate);
+                    module.set.value(selectedValue, selectedText, $selected);
+                    module.set.filtered();
                   }
                   else {
+                    module.set.value(selectedValue, selectedText, $selected);
                     module.set.text(selectedText);
                   }
-                  module.set.value(selectedValue, selectedText, $selected);
                 })
               ;
             }
@@ -1658,8 +1665,8 @@ $.fn.dropdown = function(parameters) {
           },
           animating: function($subMenu) {
             return ($subMenu)
-              ? $subMenu.is(':animated') || $subMenu.transition && $subMenu.transition('is animating')
-              : $menu.is(':animated') || $menu.transition && $menu.transition('is animating')
+              ? $subMenu.transition && $subMenu.transition('is animating')
+              : $menu.transition    && $menu.transition('is animating')
             ;
           },
           focusedOnSearch: function() {
@@ -1812,8 +1819,6 @@ $.fn.dropdown = function(parameters) {
                 ;
               }
 
-              $input.trigger('blur');
-
               if(settings.transition == 'none') {
                 callback.call(element);
               }