Browse Source

Fix issue from fix earlier today with multi select selecting blank quote values

pull/2416/head
jlukic 10 years ago
parent
commit
a9c94a1972
1 changed files with 8 additions and 4 deletions
  1. 12
      src/definitions/modules/dropdown.js

12
src/definitions/modules/dropdown.js

@ -1374,13 +1374,13 @@ $.fn.dropdown = function(parameters) {
var
values = module.get.values()
;
if(!values) {
return false;
}
values = $.isArray(values)
? values
: [values]
;
if(!values) {
return false;
}
return $.grep(values, function(value) {
return (module.get.item(value) === false);
});
@ -1575,6 +1575,7 @@ $.fn.dropdown = function(parameters) {
$userItems = module.create.userChoice(value),
hasUserItems = ($userItems && $userItems.length > 0)
;
console.log(hasUserItems, value, $module);
if(hasUserItems) {
$items = ($items.length > 0)
? $items.add($userItems)
@ -2045,7 +2046,9 @@ $.fn.dropdown = function(parameters) {
if(hasInput) {
if(value == currentValue) {
module.verbose('Skipping value update already same value', value, currentValue);
return;
if(!module.is.initialLoad()) {
return;
}
}
module.debug('Updating input value', value, currentValue);
$input
@ -2117,6 +2120,7 @@ $.fn.dropdown = function(parameters) {
}
if(settings.useLabels) {
module.add.value(selectedValue, selectedText, $selected);
console.log(selectedValue);
module.add.label(selectedValue, selectedText, shouldAnimate);
$selected.addClass(className.active);
module.filterActive();

Loading…
Cancel
Save