Browse Source

#2510 Fix dropdown icon to always toggle visibility of dropdown menu

pull/2537/merge
jlukic 10 years ago
parent
commit
89e05127d0
1 changed files with 11 additions and 2 deletions
  1. 13
      src/definitions/modules/dropdown.js

13
src/definitions/modules/dropdown.js

@ -494,6 +494,7 @@ $.fn.dropdown = function(parameters) {
$module $module
.on('mousedown' + eventNamespace, selector.menu, module.event.menu.mousedown) .on('mousedown' + eventNamespace, selector.menu, module.event.menu.mousedown)
.on('mouseup' + eventNamespace, selector.menu, module.event.menu.mouseup) .on('mouseup' + eventNamespace, selector.menu, module.event.menu.mouseup)
.on('click' + eventNamespace, selector.icon, module.event.icon.click)
.on('click' + eventNamespace, selector.search, module.show) .on('click' + eventNamespace, selector.search, module.show)
.on('focus' + eventNamespace, selector.search, module.event.search.focus) .on('focus' + eventNamespace, selector.search, module.event.search.focus)
.on('blur' + eventNamespace, selector.search, module.event.search.blur) .on('blur' + eventNamespace, selector.search, module.event.search.blur)
@ -501,13 +502,14 @@ $.fn.dropdown = function(parameters) {
; ;
if(module.is.multiple()) { if(module.is.multiple()) {
$module $module
.on('click' + eventNamespace, module.event.click)
.on('click' + eventNamespace, module.event.click)
; ;
} }
} }
else { else {
if(settings.on == 'click') { if(settings.on == 'click') {
$module $module
.on('click' + eventNamespace, selector.icon, module.event.icon.click)
.on('click' + eventNamespace, module.event.test.toggle) .on('click' + eventNamespace, module.event.test.toggle)
; ;
} }
@ -779,7 +781,7 @@ $.fn.dropdown = function(parameters) {
$target = $(event.target) $target = $(event.target)
; ;
// focus search // focus search
if(($target.is($module) || $target.is($icon)) && !module.is.focusedOnSearch()) {
if($target.is($module) && !module.is.focusedOnSearch()) {
module.focusSearch(); module.focusSearch();
} }
}, },
@ -823,6 +825,13 @@ $.fn.dropdown = function(parameters) {
} }
} }
}, },
icon: {
click: function(event) {
console.log('icon close');
module.toggle();
event.stopPropagation();
}
},
text: { text: {
focus: function(event) { focus: function(event) {
activated = true; activated = true;

Loading…
Cancel
Save