Browse Source

Fixes issue with items selecting element even if touchmove #1199

pull/1243/merge
jlukic 10 years ago
parent
commit
b1676eab45
1 changed files with 5 additions and 9 deletions
  1. 14
      src/definitions/modules/dropdown.js

14
src/definitions/modules/dropdown.js

@ -265,10 +265,7 @@ $.fn.dropdown = function(parameters) {
touchEvents: function() { touchEvents: function() {
module.debug('Touch device detected binding additional touch events'); module.debug('Touch device detected binding additional touch events');
if( module.is.searchSelection() ) { if( module.is.searchSelection() ) {
$module
.on('touchstart' + eventNamespace, selector.menu, module.event.menu.mousedown)
.on('touchend' + eventNamespace, selector.menu, module.event.menu.mouseup)
;
// do nothing special yet
} }
else { else {
$module $module
@ -277,15 +274,14 @@ $.fn.dropdown = function(parameters) {
} }
$module $module
.on('touchstart' + eventNamespace, selector.item, module.event.item.mouseenter) .on('touchstart' + eventNamespace, selector.item, module.event.item.mouseenter)
.on('touchstart' + eventNamespace, selector.item, module.event.item.click)
; ;
}, },
mouseEvents: function() { mouseEvents: function() {
module.verbose('Mouse detected binding mouse events'); module.verbose('Mouse detected binding mouse events');
if( module.is.searchSelection() ) { if( module.is.searchSelection() ) {
$module $module
.on('mousedown' + eventNamespace, selector.menu, module.event.menu.mousedown)
.on('mouseup' + eventNamespace, selector.menu, module.event.menu.mouseup)
.on('mousedown' + eventNamespace, selector.menu, module.event.menu.activate)
.on('mouseup' + eventNamespace, selector.menu, module.event.menu.deactivate)
.on('focus' + eventNamespace, selector.search, module.event.searchFocus) .on('focus' + eventNamespace, selector.search, module.event.searchFocus)
.on('blur' + eventNamespace, selector.search, module.event.searchBlur) .on('blur' + eventNamespace, selector.search, module.event.searchBlur)
; ;
@ -538,10 +534,10 @@ $.fn.dropdown = function(parameters) {
}, },
menu: { menu: {
mousedown: function() {
activate: function() {
itemActivated = true; itemActivated = true;
}, },
mouseup: function() {
deactivate: function() {
itemActivated = false; itemActivated = false;
} }
}, },

Loading…
Cancel
Save