digilib-old: client/digitallibrary/jquery/jquery.digilib.js comparison

comparison client/digitallibrary/jquery/jquery.digilib.js @ 730:fec653a3094e jquery

better birdMoveArea, now called setupBirdDrag.

author	robcast
date	Tue, 01 Feb 2011 16:03:57 +0100
parents	84ad95fd3202
children	d69a72e8562f

comparison

equal deleted inserted replaced

-:84ad95fd3202
+:fec653a3094e
 $birdImg.attr('src', newsrc);
 // onload handler re-renders
 } else {
 // re-render
 renderBirdArea(data);
+// enable click and drag
+birdMoveArea(data);
 }
 };
 // creates HTML structure for the about view in elem
 var setupAboutDiv = function (data) {
 $birdZoom.hide();
 return;
 } else {
 $birdZoom.show();
 }
+// position may have changed
+data.birdTrafo = getImgTrafo(data.$birdImg, MAX_ZOOMAREA);
 var indRect = data.birdTrafo.transform(zoomArea);
 var coords = {
 left : indRect.x-2, // acount for frame width
 top : indRect.y-2,
 width : indRect.width,
 // bird's eye view zoom area click and drag handler
 var birdMoveArea = function(data) {
 var $birdImg = data.$birdImg;
 var $birdZoom = data.$birdZoom;
+var $document = $(document);
 var startPos, newRect, birdImgRect, birdZoomRect;
 var birdZoomMove = function(evt) {
 // mousemove handler: drag
 var pos = geom.position(evt);
-var dx = pos.x - startPos.x;
+var delta = startPos.delta(pos);
-var dy = pos.y - startPos.y;
 // move birdZoom div, keeping size
-newRect = geom.rectangle(
+newRect = birdZoomRect.copy();
-birdZoomRect.x + dx,
+newRect.addPt1(delta);
-birdZoomRect.y + dy,
-birdZoomRect.width,
-birdZoomRect.height);
 // stay within birdimage
 newRect.stayInside(birdImgRect);
-$birdZoom.offset({left : newRect.x, top : newRect.y});
+newRect.adjustDiv($birdZoom);
-// $birdZoom.show();
 return false;
 };
 var birdZoomEndDrag = function(evt) {
 // mouseup handler: reload page
 var settings = data.settings;
-$(document).unbind("mousemove.digilib", birdZoomMove);
+$document.unbind("mousemove.dlBirdMove", birdZoomMove);
-$(document).unbind("mouseup.digilib", birdZoomEndDrag);
+$document.unbind("mouseup.dlBirdMove", birdZoomEndDrag);
-$birdZoom.unbind("mousemove.digilib", birdZoomMove);
+$birdZoom.unbind("mousemove.dlBirdMove", birdZoomMove);
-$birdZoom.unbind("mouseup.digilib", birdZoomEndDrag);
+$birdZoom.unbind("mouseup.dlBirdMove", birdZoomEndDrag);
-if (newRect == null) { // no movement happened
+if (newRect == null) {
+// no movement happened - set center to click position
 startPos = birdZoomRect.getCenter();
-birdZoomMove(evt); // set center to click position
+birdZoomMove(evt);
 }
-if (data.zoomArea) {
+var newArea = data.birdTrafo.invtransform(newRect);
-// should always be true
+data.zoomArea = newArea;
-var x = cropFloat((newRect.x - birdImgRect.x + 2) / birdImgRect.width);
-var y = cropFloat((newRect.y - birdImgRect.y + 2) / birdImgRect.height);
-data.zoomArea.x = x;
-data.zoomArea.y = y;
-}
-settings.ws = 1; // zoomed is always fit
 redisplay(data);
 return false;
 };
 var birdZoomStartDrag = function(evt) {
 // mousedown handler: start dragging bird zoom to a new position
 startPos = geom.position(evt);
+// position may have changed
+data.birdTrafo = getImgTrafo($birdImg, MAX_ZOOMAREA);
 birdImgRect = geom.rectangle($birdImg);
 birdZoomRect = geom.rectangle($birdZoom);
-$(document).bind("mousemove.digilib", birdZoomMove);
+$document.bind("mousemove.dlBirdMove", birdZoomMove);
-$(document).bind("mouseup.digilib", birdZoomEndDrag);
+$document.bind("mouseup.dlBirdMove", birdZoomEndDrag);
-$birdZoom.bind("mousemove.digilib", birdZoomMove);
+$birdZoom.bind("mousemove.dlBirdMove", birdZoomMove);
-$birdZoom.bind("mouseup.digilib", birdZoomEndDrag);
+$birdZoom.bind("mouseup.dlBirdMove", birdZoomEndDrag);
 return false;
 };
-$birdImg.bind("mousedown.digilib", birdZoomStartDrag);
+// clear old handler
-$birdZoom.bind("mousedown.digilib", birdZoomStartDrag);
+$document.unbind(".dlBirdMove");
+$birdImg.unbind(".dlBirdMove");
+$birdZoom.unbind(".dlBirdMove");
+// set new handler
+$birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag);
+$birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag);
 };
 var setupZoomDrag = function(data) {
 // setup handlers for dragging the zoomed image
 var pt1, pt2;
 'background-image' : 'url(' + $img.attr('src') + ')',
 'background-repeat' : 'no-repeat',
 'background-position' : 'top left',
 'cursor' : 'move'
 });
-$img.hide();
+$img.css('visibility', 'hidden');
 $(document).bind("mousemove.digilib", dragMove);
 $(document).bind("mouseup.digilib", dragEnd);
 return false;
 };