# HG changeset patch # User hertzhaft # Date 1476736620 -7200 # Node ID 157198c7e8050ea49a8af582e300b7466b98a3ab # Parent 747ed0af86634bc17ff5f622a7f935cd07e66d92 unify measure mouse events diff -r 747ed0af8663 -r 157198c7e805 webapp/src/main/webapp/jquery/jquery.digilib.measure.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.measure.js Sun Oct 16 20:41:53 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.measure.js Mon Oct 17 22:37:00 2016 +0200 @@ -896,8 +896,8 @@ ? shape.$elem.children('path') : shape.$elem; console.debug('measure: onChangeShape', $elem); - $elem.on('mouseover.measure', info); - $elem.on('click.measure', select); + $elem.on('mouseover.measureinfo', info); + $elem.on('click.measureselect', select); updateInfo(data, shape); currentShape = null; _debug_shape('onChangeShape', shape); @@ -1257,8 +1257,8 @@ var timer; $info.html(getInfo(data, shape)); console.debug('Info', shape); - $info.on('mouseout', function() { timer = setTimeout(hideInfoDiv, 300) }); - $info.on('mouseover', function() { clearTimeout(timer) }); + $info.on('mouseout.measureinfo', function() { timer = setTimeout(hideInfoDiv, 300) }); + $info.on('mouseover.measureinfo', function() { clearTimeout(timer) }); $info.fadeIn(); return false; };