# HG changeset patch
# User hertzhaft
# Date 1478034284 -3600
# Node ID bbe5d0bc1a7ea256519c63d6c6fcd4120bd93fb5
# Parent 888a8cc26f0032463199ec7da2fdbd1acae87379# Parent 2762b7bc56d1255f1c250880d7a8d738a7087244
merge
diff -r 888a8cc26f00 -r bbe5d0bc1a7e webapp/src/main/webapp/jquery/jquery-test-measure.html
--- 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 @@
-
diff -r 888a8cc26f00 -r bbe5d0bc1a7e webapp/src/main/webapp/jquery/jquery.digilib.birdseye.js
--- 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;
diff -r 888a8cc26f00 -r bbe5d0bc1a7e webapp/src/main/webapp/jquery/jquery.digilib.js
diff -r 888a8cc26f00 -r bbe5d0bc1a7e webapp/src/main/webapp/jquery/jquery.digilib.regions.js
--- 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);
};
diff -r 888a8cc26f00 -r bbe5d0bc1a7e webapp/src/main/webapp/jquery/jquery.digilib.vector.js