4c7777010756e76c973ee248c9c8fa3738e7ea02 larrym Tue Aug 2 18:10:35 2011 -0700 fix bugs in allowDragAndZoomEverywhere diff --git src/hg/js/jquery.imgareaselect.js src/hg/js/jquery.imgareaselect.js index 4ce9135..6bcbefd 100644 --- src/hg/js/jquery.imgareaselect.js +++ src/hg/js/jquery.imgareaselect.js @@ -303,41 +303,45 @@ return false; } function startSelection(event) { adjust(); selection.x1 = selection.x2 = selX(startX = x1 = x2 = evX(event)); selection.y1 = selection.y2 = selY(startY = y1 = y2 = evY(event)); selection.width = 0; selection.height = 0; selection.event = event; if(options.clickClipHeight != null) { // This is necessary on IE to support clicks in an image which has map items. + var found = false; if(typeof(options.clickClipHeight) == 'number') { - if(selection.y1 > options.clickClipHeight) { - return false; + if(selection.y1 < options.clickClipHeight) { + found = true; } } else { - for(var i = 0; i < options.clickClipHeight.length; i++) { - if(selection.y1 > options.clickClipHeight[i].top && selection.y1 < options.clickClipHeight[i].bottom) { - return false; + for(var i = 0; !found && i < options.clickClipHeight.length; i++) { + if(selection.y1 >= options.clickClipHeight[i].top && selection.y1 < options.clickClipHeight[i].bottom) { + found = true; } } } + if(!found) { + return false; + } } resize = [ ]; update(); $a.add($o).show(); jQuery(document).unbind('mouseup', cancelSelection) .mousemove(selectingMouseMove); $border2.unbind('mousemove', areaMouseMove); options.onSelectStart(img, selection); jQuery(document).one('mouseup', function (event) { selection.event = event;