|
|
@ -4613,12 +4613,12 @@ $.fn.dropdown = function(parameters) { |
|
|
; |
|
|
; |
|
|
if( module.can.show() && !module.is.active() ) { |
|
|
if( module.can.show() && !module.is.active() ) { |
|
|
module.debug('Showing dropdown'); |
|
|
module.debug('Showing dropdown'); |
|
|
if(module.is.multiple() && !module.has.search() && module.is.allFiltered()) { |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
if(module.has.message() && !(module.has.maxSelections() || module.has.allResultsFiltered()) ) { |
|
|
if(module.has.message() && !(module.has.maxSelections() || module.has.allResultsFiltered()) ) { |
|
|
module.remove.message(); |
|
|
module.remove.message(); |
|
|
} |
|
|
} |
|
|
|
|
|
if(module.is.allFiltered()) { |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
if(settings.onShow.call(element) !== false) { |
|
|
if(settings.onShow.call(element) !== false) { |
|
|
module.animate.show(function() { |
|
|
module.animate.show(function() { |
|
|
if( module.can.click() ) { |
|
|
if( module.can.click() ) { |
|
|
@ -4990,9 +4990,16 @@ $.fn.dropdown = function(parameters) { |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
focusSearch: function() { |
|
|
focusSearch: function(skipHandler) { |
|
|
if( module.is.search() && !module.is.focusedOnSearch() ) { |
|
|
if( module.is.search() && !module.is.focusedOnSearch() ) { |
|
|
$search[0].focus(); |
|
|
if(skipHandler) { |
|
|
|
|
|
$module.off('focus' + eventNamespace, selector.search); |
|
|
|
|
|
$search.focus(); |
|
|
|
|
|
$module.on('focus' + eventNamespace, selector.search, module.event.search.focus) |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
$search.focus(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
@ -5008,11 +5015,17 @@ $.fn.dropdown = function(parameters) { |
|
|
if( module.has.query() ) { |
|
|
if( module.has.query() ) { |
|
|
if(hasSelected) { |
|
|
if(hasSelected) { |
|
|
module.debug('Forcing partial selection to selected item', $selectedItem); |
|
|
module.debug('Forcing partial selection to selected item', $selectedItem); |
|
|
module.event.item.click.call($selectedItem); |
|
|
module.event.item.click.call($selectedItem, {}, true); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
module.remove.searchTerm(); |
|
|
if(settings.allowAdditions) { |
|
|
|
|
|
module.set.selected(module.get.query()); |
|
|
|
|
|
module.remove.searchTerm(); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
module.remove.searchTerm(); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
module.hide(); |
|
|
module.hide(); |
|
|
@ -5084,11 +5097,7 @@ $.fn.dropdown = function(parameters) { |
|
|
pageLostFocus = (document.activeElement === this); |
|
|
pageLostFocus = (document.activeElement === this); |
|
|
if(!willRefocus) { |
|
|
if(!willRefocus) { |
|
|
if(!itemActivated && !pageLostFocus) { |
|
|
if(!itemActivated && !pageLostFocus) { |
|
|
if(module.is.multiple()) { |
|
|
if(settings.forceSelection) { |
|
|
module.remove.activeLabel(); |
|
|
|
|
|
module.hide(); |
|
|
|
|
|
} |
|
|
|
|
|
else if(settings.forceSelection) { |
|
|
|
|
|
module.forceSelection(); |
|
|
module.forceSelection(); |
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
@ -5234,7 +5243,7 @@ $.fn.dropdown = function(parameters) { |
|
|
}, settings.delay.hide); |
|
|
}, settings.delay.hide); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
click: function (event) { |
|
|
click: function (event, skipRefocus) { |
|
|
var |
|
|
var |
|
|
$choice = $(this), |
|
|
$choice = $(this), |
|
|
$target = (event) |
|
|
$target = (event) |
|
|
@ -5252,8 +5261,8 @@ $.fn.dropdown = function(parameters) { |
|
|
module.remove.userAddition(); |
|
|
module.remove.userAddition(); |
|
|
} |
|
|
} |
|
|
module.remove.searchTerm(); |
|
|
module.remove.searchTerm(); |
|
|
if(!module.is.focusedOnSearch()) { |
|
|
if(!module.is.focusedOnSearch() && !(skipRefocus == true)) { |
|
|
module.focusSearch(); |
|
|
module.focusSearch(true); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if(!settings.useLabels) { |
|
|
if(!settings.useLabels) { |
|
|
@ -5602,7 +5611,7 @@ $.fn.dropdown = function(parameters) { |
|
|
var |
|
|
var |
|
|
$target = $(event.target), |
|
|
$target = $(event.target), |
|
|
$label = $target.closest(selector.siblingLabel), |
|
|
$label = $target.closest(selector.siblingLabel), |
|
|
inVisibleDOM = document.contains(event.target), |
|
|
inVisibleDOM = document.body.contains(event.target), |
|
|
notOnLabel = ($module.find($label).length === 0), |
|
|
notOnLabel = ($module.find($label).length === 0), |
|
|
notInMenu = ($target.closest($menu).length === 0) |
|
|
notInMenu = ($target.closest($menu).length === 0) |
|
|
; |
|
|
; |
|
|
@ -5781,16 +5790,17 @@ $.fn.dropdown = function(parameters) { |
|
|
if(typeof values == 'string') { |
|
|
if(typeof values == 'string') { |
|
|
values = [values]; |
|
|
values = [values]; |
|
|
} |
|
|
} |
|
|
remoteValues = {}; |
|
|
|
|
|
$.each(values, function(index, value) { |
|
|
$.each(values, function(index, value) { |
|
|
var |
|
|
var |
|
|
name = module.read.remoteData(value) |
|
|
name = module.read.remoteData(value) |
|
|
; |
|
|
; |
|
|
module.verbose('Restoring value from session data', name, value); |
|
|
module.verbose('Restoring value from session data', name, value); |
|
|
remoteValues[value] = (name) |
|
|
if(name) { |
|
|
? name |
|
|
if(!remoteValues) { |
|
|
: value |
|
|
remoteValues = {}; |
|
|
; |
|
|
} |
|
|
|
|
|
remoteValues[value] = name; |
|
|
|
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
return remoteValues; |
|
|
return remoteValues; |
|
|
@ -6067,13 +6077,8 @@ $.fn.dropdown = function(parameters) { |
|
|
values: function() { |
|
|
values: function() { |
|
|
// prevents callbacks from occuring on initial load
|
|
|
// prevents callbacks from occuring on initial load
|
|
|
module.set.initialLoad(); |
|
|
module.set.initialLoad(); |
|
|
if(settings.apiSettings) { |
|
|
if(settings.apiSettings && settings.saveRemoteData && module.get.remoteValues()) { |
|
|
if(settings.saveRemoteData) { |
|
|
module.restore.remoteValues(); |
|
|
module.restore.remoteValues(); |
|
|
|
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
module.clearValue(); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
else { |
|
|
else { |
|
|
module.set.selected(); |
|
|
module.set.selected(); |
|
|
@ -6930,6 +6935,7 @@ $.fn.dropdown = function(parameters) { |
|
|
module.debug('Label remove callback cancelled removal'); |
|
|
module.debug('Label remove callback cancelled removal'); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
module.remove.message(); |
|
|
if(isUserValue) { |
|
|
if(isUserValue) { |
|
|
module.remove.value(stringValue); |
|
|
module.remove.value(stringValue); |
|
|
module.remove.label(stringValue); |
|
|
module.remove.label(stringValue); |
|
|
@ -7006,7 +7012,7 @@ $.fn.dropdown = function(parameters) { |
|
|
return (settings.maxSelections && module.get.selectionCount() >= settings.maxSelections); |
|
|
return (settings.maxSelections && module.get.selectionCount() >= settings.maxSelections); |
|
|
}, |
|
|
}, |
|
|
allResultsFiltered: function() { |
|
|
allResultsFiltered: function() { |
|
|
let |
|
|
var |
|
|
$normalResults = $item.not(selector.addition) |
|
|
$normalResults = $item.not(selector.addition) |
|
|
; |
|
|
; |
|
|
return ($normalResults.filter(selector.unselectable).length === $normalResults.length); |
|
|
return ($normalResults.filter(selector.unselectable).length === $normalResults.length); |
|
|
@ -13506,12 +13512,15 @@ $.fn.search = function(parameters) { |
|
|
return false; |
|
|
return false; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
$results |
|
|
if(html) { |
|
|
.html(html) |
|
|
$results |
|
|
; |
|
|
.html(html) |
|
|
if( module.can.show() ) { |
|
|
; |
|
|
module.showResults(); |
|
|
module.showResults(); |
|
|
} |
|
|
} |
|
|
|
|
|
else { |
|
|
|
|
|
module.hideResults(); |
|
|
|
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
showResults: function() { |
|
|
showResults: function() { |
|
|
@ -13589,7 +13598,7 @@ $.fn.search = function(parameters) { |
|
|
module.error(error.noTemplate, false); |
|
|
module.error(error.noTemplate, false); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else { |
|
|
else if(settings.showNoResults) { |
|
|
html = module.displayMessage(error.noResults, 'empty'); |
|
|
html = module.displayMessage(error.noResults, 'empty'); |
|
|
} |
|
|
} |
|
|
settings.onResults.call(element, response); |
|
|
settings.onResults.call(element, response); |
|
|
@ -13793,44 +13802,47 @@ $.fn.search.settings = { |
|
|
verbose : false, |
|
|
verbose : false, |
|
|
performance : true, |
|
|
performance : true, |
|
|
|
|
|
|
|
|
type : 'standard', |
|
|
|
|
|
// template to use (specified in settings.templates)
|
|
|
// template to use (specified in settings.templates)
|
|
|
|
|
|
type : 'standard', |
|
|
|
|
|
|
|
|
minCharacters : 1, |
|
|
|
|
|
// minimum characters required to search
|
|
|
// minimum characters required to search
|
|
|
|
|
|
minCharacters : 1, |
|
|
|
|
|
|
|
|
apiSettings : false, |
|
|
|
|
|
// API config
|
|
|
// API config
|
|
|
|
|
|
apiSettings : false, |
|
|
|
|
|
|
|
|
source : false, |
|
|
|
|
|
// object to search
|
|
|
// object to search
|
|
|
|
|
|
source : false, |
|
|
|
|
|
|
|
|
|
|
|
// fields to search
|
|
|
searchFields : [ |
|
|
searchFields : [ |
|
|
'title', |
|
|
'title', |
|
|
'description' |
|
|
'description' |
|
|
], |
|
|
], |
|
|
// fields to search
|
|
|
|
|
|
|
|
|
|
|
|
displayField : '', |
|
|
|
|
|
// field to display in standard results template
|
|
|
// field to display in standard results template
|
|
|
|
|
|
displayField : '', |
|
|
|
|
|
|
|
|
searchFullText : true, |
|
|
|
|
|
// whether to include fuzzy results in local search
|
|
|
// whether to include fuzzy results in local search
|
|
|
|
|
|
searchFullText : true, |
|
|
|
|
|
|
|
|
automatic : true, |
|
|
|
|
|
// whether to add events to prompt automatically
|
|
|
// whether to add events to prompt automatically
|
|
|
|
|
|
automatic : true, |
|
|
|
|
|
|
|
|
hideDelay : 0, |
|
|
|
|
|
// delay before hiding menu after blur
|
|
|
// delay before hiding menu after blur
|
|
|
|
|
|
hideDelay : 0, |
|
|
|
|
|
|
|
|
searchDelay : 200, |
|
|
|
|
|
// delay before searching
|
|
|
// delay before searching
|
|
|
|
|
|
searchDelay : 200, |
|
|
|
|
|
|
|
|
maxResults : 7, |
|
|
|
|
|
// maximum results returned from local
|
|
|
// maximum results returned from local
|
|
|
|
|
|
maxResults : 7, |
|
|
|
|
|
|
|
|
cache : true, |
|
|
|
|
|
// whether to store lookups in local cache
|
|
|
// whether to store lookups in local cache
|
|
|
|
|
|
cache : true, |
|
|
|
|
|
|
|
|
|
|
|
// whether no results errors should be shown
|
|
|
|
|
|
showNoResults : true, |
|
|
|
|
|
|
|
|
// transition settings
|
|
|
// transition settings
|
|
|
transition : 'scale', |
|
|
transition : 'scale', |
|
|
|
Jack Lukic
9 years ago
xxxxxxxxxx