Mercurial > hg > digilib
changeset 1562:bbe5d0bc1a7e measure-maps
merge
author | hertzhaft |
---|---|
date | Tue, 01 Nov 2016 22:04:44 +0100 |
parents | 888a8cc26f00 (current diff) 2762b7bc56d1 (diff) |
children | 001e6fa1c7fb |
files | webapp/src/main/webapp/jquery/jquery-test-measure.html webapp/src/main/webapp/jquery/jquery.digilib.js webapp/src/main/webapp/jquery/jquery.digilib.vector.js |
diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery-test-measure.html Fri Oct 28 15:57:30 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery-test-measure.html Tue Nov 01 22:04:44 2016 +0100 @@ -16,7 +16,6 @@ <script type="text/javascript" src="jquery.cookie.js"></script> <script type="text/javascript" src="jquery.digilib.js"></script> <script type="text/javascript" src="jquery.digilib.geometry.js"></script> - <script type="text/javascript" src="jquery.digilib.arrows.js"></script> <script type="text/javascript" src="jquery.range.js"></script> <link rel="stylesheet" type="text/css" href="jquery.range.css"/> <script type="text/javascript" src="jquery.digilib.buttons.js"></script>
--- a/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js Fri Oct 28 15:57:30 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js Tue Nov 01 22:04:44 2016 +0100 @@ -274,6 +274,8 @@ // grow rectangle by border width newRect = null; data.$elem.find('.'+cssPrefix+'overlay').hide(); // hide all overlays (marks/regions) + // hide image + digilib.fn.fadeScalerImg(data, 0); $document.on("mousemove.dlBirdMove", birdZoomMove); $document.on("mouseup.dlBirdMove", birdZoomEndDrag); return false;
--- a/webapp/src/main/webapp/jquery/jquery.digilib.regions.js Fri Oct 28 15:57:30 2016 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.regions.js Tue Nov 01 22:04:44 2016 +0100 @@ -688,6 +688,8 @@ za.setProportion(1, true); // avoid extreme zoomArea proportions za.setCenter(rect.getCenter()).stayInside(FULL_AREA); fn.setZoomArea(data, za); + // hide image + fn.fadeScalerImg(data, 0); fn.redisplay(data); };