# HG changeset patch # User robcast # Date 1296574238 -3600 # Node ID 55f2dd197ca996b2390910f8c107ff97a630772f # Parent d69a72e8562f1eff549b66dab9e88af3ad63d7c3 really renamed birdMoveArea, really merged fix for no zoom area. diff -r d69a72e8562f -r 55f2dd197ca9 client/digitallibrary/jquery/jquery.digilib.js --- a/client/digitallibrary/jquery/jquery.digilib.js Tue Feb 01 16:11:45 2011 +0100 +++ b/client/digitallibrary/jquery/jquery.digilib.js Tue Feb 01 16:30:38 2011 +0100 @@ -986,7 +986,7 @@ // re-render renderBirdArea(data); // enable click and drag - birdMoveArea(data); + setupBirdDrag(data); } }; @@ -1132,7 +1132,7 @@ // display red indicator around zoomarea renderBirdArea(data); // enable click and drag - birdMoveArea(data); + setupBirdDrag(data); }; }; @@ -1280,7 +1280,7 @@ }; // bird's eye view zoom area click and drag handler - var birdMoveArea = function(data) { + var setupBirdDrag = function(data) { var $birdImg = data.$birdImg; var $birdZoom = data.$birdZoom; var $document = $(document); @@ -1335,9 +1335,11 @@ $document.unbind(".dlBirdMove"); $birdImg.unbind(".dlBirdMove"); $birdZoom.unbind(".dlBirdMove"); - // set new handler - $birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag); - $birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag); + if (! isFullArea(data.zoomArea)) { + // set new handler + $birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag); + $birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag); + } }; var setupZoomDrag = function(data) { @@ -1443,7 +1445,7 @@ }; // auxiliary function (from old dllib.js) - isFullArea = function(area) { + var isFullArea = function(area) { return (area.width === 1.0) && (area.height === 1.0); };