ab8f91bcf1d8b0f87622272c9b67e1a96d593d69 tdreszer Tue Aug 2 15:52:34 2011 -0700 Fixed FF on Mac context menu bug (redmine 3468). diff --git src/hg/js/jquery.imgareaselect.js src/hg/js/jquery.imgareaselect.js index 32be14f..4ce9135 100644 --- src/hg/js/jquery.imgareaselect.js +++ src/hg/js/jquery.imgareaselect.js @@ -130,31 +130,31 @@ resize[V] = 'n'; else if (y >= selection.height - resizeMargin) resize[V] = 's'; if (x <= resizeMargin) resize[H] = 'w'; else if (x >= selection.width - resizeMargin) resize[H] = 'e'; } $border2.css('cursor', resize.length ? resize.join('') + '-resize' : options.movable ? 'move' : ''); } function areaMouseDown(event) { - if (event.which != 1) return false; + if (event.which > 1 || event.button > 1) return true; selection.event = event; adjust(); if (options.resizable && resize.length > 0) { jQuery('body').css('cursor', resize.join('') + '-resize'); x1 = viewX(resize[H] == 'w' ? selection.x2 : selection.x1); y1 = viewY(resize[V] == 'n' ? selection.y2 : selection.y1); jQuery(document).mousemove(selectingMouseMove); $border2.unbind('mousemove', areaMouseMove); jQuery(document).one('mouseup', function (event) { selection.event = event; @@ -356,31 +356,31 @@ // The default behavior of imgareaselect is to cancel selection if the user let's go of the mouse before // moving it; we change the behavior so we can treat this as a single click, centering event. selection.event = event; jQuery(document).unbind('mousemove', startSelection); $a.add($o).hide(); selection.x1 = selection.x2 = selX(startX = x1 = x2 = evX(event)); selection.y1 = selection.y2 = selY(startY = y1 = y2 = evY(event)); options.onSelectChange(img, selection); options.onSelectEnd(img, selection); } function imgMouseDown(event) { - if (event.which != 1) return false; + if (event.which > 1 || event.button > 1) return true; jQuery(document).one('mousemove', startSelection) .one('mouseup', cancelSelection); return false; } function windowResize() { adjust(); update(false); x1 = viewX(selection.x1); y1 = viewY(selection.y1); x2 = viewX(selection.x2); y2 = viewY(selection.y2);