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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 738:b4460f0a540d jquery

small improvements

author	robcast
date	Wed, 02 Feb 2011 14:17:52 +0100
parents	7c93bdbb5153
children	922c74a7b935

comparison

equal deleted inserted replaced

-:7c93bdbb5153
+:b4460f0a540d
 $img.addClass('pic');
 data.$scaler = $scaler;
 data.$img = $img;
 // setup image load handler before setting the src attribute (IE bug)
 $img.load(scalerImgLoadedHandler(data));
+$scaler.css('cursor', 'wait');
 $img.attr('src', scalerUrl);
 };
 // creates HTML structure for buttons in elem
 var createButtons = function (data, buttonSetIdx) {
 // returns function for load event of scaler img
 var scalerImgLoadedHandler = function (data) {
 return function () {
 var $img = $(this);
+var $scaler = data.$scaler;
 console.debug("img loaded! this=", this, " data=", data);
 // create Transform from current area and picsize
 data.imgTrafo = getImgTrafo($img, data.zoomArea,
 data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir);
 console.debug("imgTrafo=", data.imgTrafo);
 // adjust scaler div size
-var imgRect = geom.rectangle(data.$img);
+var imgRect = geom.rectangle($img);
 console.debug("imgrect=", imgRect);
-imgRect.adjustDiv(data.$scaler);
+imgRect.adjustDiv($scaler);
 // show image in case it was hidden (for example in zoomDrag)
 $img.css('visibility', 'visible');
+$scaler.css('cursor', 'auto');
 // display marks
 renderMarks(data);
 // TODO: digilib.showArrows(); // show arrow overlays for zoom navigation
 };
 };
 } else {
 $birdZoom.show();
 }
 // position may have changed
 data.birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
-var indRect = data.birdTrafo.transform(zoomArea);
+var zoomRect = data.birdTrafo.transform(zoomArea);
-var coords = {
+// TODO: acount for frame width
-left : indRect.x-2, // acount for frame width
-top : indRect.y-2,
-width : indRect.width,
-height: indRect.height
-};
 if (data.settings.interactionMode === 'fullscreen') {
 // no animation for fullscreen
-$birdZoom.width(coords.width);
+zoomRect.adjustDiv($birdZoom);
-$birdZoom.height(coords.height);
-$birdZoom.offset(coords);
 } else {
 // nice animation for embedded mode :-)
+// correct offsetParent because animate is relative
 var ppos = $birdZoom.offsetParent().offset();
-// correct offsetParent because animate is relative
+var dest = {
-coords.left = (coords.left - ppos.left) + 'px' ;
+left : (zoomRect.x - ppos.left) + 'px',
-coords.top = (coords.top - ppos.top) + 'px';
+top : (zoomRect.y - ppos.top) + 'px',
-$birdZoom.animate(coords);
+width : zoomRect.width,
+height : zoomRect.height};
+$birdZoom.animate(dest);
 }
 };
 // zooms by the given factor
 var zoomBy = function(data, factor) {
 redisplay(data);
 return false; // do we even get here?
 });
 };
+// zoom to area around two clicked points
 var zoomArea = function(data) {
 $elem = data.$elem;
 $scaler = data.$scaler;
 var pt1, pt2;
 var $zoomDiv = $('<div class="zoomrect" style="display:none"/>');
 // rect.y -= 2;
 var zoomStart = function (evt) {
 pt1 = geom.position(evt);
 // setup and show zoom div
-//moveElement(zoomdiv, Rectangle(pt1.x, pt1.y, 0, 0));
+pt1.adjustDiv($zoomDiv);
-$zoomDiv.offset({left : pt1.x, top : pt1.y});
 $zoomDiv.width(0).height(0);
 $zoomDiv.show();
 // register events
-$elem.bind("mousemove.digilib", zoomMove);
+$elem.bind("mousemove.dlZoomArea", zoomMove);
-$elem.bind("mouseup.digilib", zoomEnd);
+$elem.bind("mouseup.dlZoomArea", zoomEnd);
 return false;
 };
 // mouseup handler: end moving
 var zoomEnd = function (evt) {
 var clickRect = geom.rectangle(pt1, pt2);
 if (clickRect.getArea() <= 5) return false;
 // hide zoom div
 $zoomDiv.remove();
 // unregister events
-$elem.unbind("mousemove.digilib", zoomMove);
+$elem.unbind("mousemove.dlZoomArea", zoomMove);
-$elem.unbind("mouseup.digilib", zoomEnd);
+$elem.unbind("mouseup.dlZoomArea", zoomEnd);
 // clip and transform
 clickRect.clipTo(picRect);
 var area = data.imgTrafo.invtransform(clickRect);
 data.zoomArea = area;
 // zoomed is always fit
 data.settings.ws = 1;
+delete data.dlOpts.fitwidth;
+delete data.dlOpts.fitheight;
 redisplay(data);
 return false;
 };
 // mouse move handler
 rect.clipTo(picRect);
 // update zoom div
 rect.adjustDiv($zoomDiv);
 return false;
 };
+// clear old handler
+$scaler.unbind('.dlZoomArea');
+$elem.unbind('.dlZoomArea');
 // bind start zoom handler
-$scaler.one('mousedown.digilib', zoomStart);
+$scaler.one('mousedown.dlZoomArea', zoomStart);
 };
 // bird's eye view zoom area click and drag handler
 var setupBirdDrag = function(data) {
 var $birdImg = data.$birdImg;
 $birdImg.bind("mousedown.dlBirdMove", birdZoomStartDrag);
 $birdZoom.bind("mousedown.dlBirdMove", birdZoomStartDrag);
 }
 };
+// setup handlers for dragging the zoomed image
 var setupZoomDrag = function(data) {
-// setup handlers for dragging the zoomed image
 var startPos, delta;
 var $document = $(document);
 var $elem = data.$elem;
 var $scaler = data.$scaler;
 var $img = data.$img;
 };
 // mouseup handler: reload zoomed image in new position
 var dragEnd = function (evt) {
 $scaler.css({
-'cursor' : 'default'
+'cursor' : 'auto'
 });
 $document.unbind("mousemove.dlZoomDrag", dragMove);
 $document.unbind("mouseup.dlZoomDrag", dragEnd);
 if (delta == null || delta.distance() < 2) {
 // no movement