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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 708:fc54b455f7f8 jquery

getting rid of bg div in zoomDrag

author	hertzhaft
date	Sun, 30 Jan 2011 18:32:40 +0100
parents	5bf8958edb9b
children	661c13bfdcde

comparison

equal deleted inserted replaced

-:5bf8958edb9b
+:fc54b455f7f8
 var $img, scalerUrl;
 // fullscreen
 if (settings.interactionMode === 'fullscreen') {
 var imgSize = getFullscreenImgSize($elem);
 // fitwidth/height omits destination height/width
-if (data.dlOpts.fitheight !== '1') {
+// if (data.dlOpts['fitheight'] !== '1') {
+if (data.dlOpts['fitheight'] == null) {
 settings.dw = imgSize.width;
 }
-if (data.dlOpts.fitwidth !== '1') {
+// if (data.dlOpts['fitwidth'] !== '1') {
+if (data.dlOpts['fitwidth'] == null) {
 settings.dh = imgSize.height;
 }
 $img = $('<img/>');
 scalerUrl = getScalerUrl(data);
 // embedded mode -- try to keep img tag
 data.$scaler = $scaler;
 data.$img = $img;
 // setup image load handler before setting the src attribute (IE bug)
 $img.load(scalerImgLoadedHandler(data));
 $img.attr('src', scalerUrl);
+// set scaler div size explicitly in case $img is hidden (for zoomDrag)
+$imgRect = geom.rectangle($img);
+$imgRect.adjustDiv(data.$scaler);
 };
 // creates HTML structure for buttons in elem
 var createButtons = function (data, buttonSetIdx) {
 var $elem = data.$elem;
 return trafo;
 };
 // returns function for load event of scaler img
 var scalerImgLoadedHandler = function (data) {
-var $img = data.$img;
 return function () {
 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);
+var $img = data.$img;
+// show image in case it was hidden (for example in zoomDrag)
+$img.show();
 // display marks
 renderMarks(data);
 // TODO: digilib.showArrows(); // show arrow overlays for zoom navigation
 var $birdImg = data.$birdImg;
 // should the birdview adapt to mirror or rotation? decision: No. :-)
 var dx = 0;
 var dy = 0;
 var $elem = data.$elem;
 var $scaler = data.$scaler;
 var $img = data.$img;
-var $bg = $elem.has('div.bgDrag');
-if ($bg.length === 0) {
-$bg = $('<div class="bgDrag" style="display:none; position:absolute"/>');
-$scaler.before($bg); // set as background
-}
 var dragStart = function (evt) {
 // drag the image and load a new detail on mouse up
 // useless if not zoomed
 if (isFullArea(data.zoomArea)) return false;
 pt1 = geom.position(evt);
 $imgRect = geom.rectangle($img);
-$imgRect.adjustDiv($bg); // set background size
+// keep scaler div size while $img is hidden (for embedded mode)
+$imgRect.adjustDiv($scaler);
 // hide the scaler image, show it as background of div instead
-$bg.css({
+$scaler.css({
 'background-image' : 'url(' + $img.attr('src') + ')',
 'background-repeat' : 'no-repeat',
 'background-position' : 'top left',
 'cursor' : 'move'
 });
 $img.hide();
-$bg.show();
 $(document).bind("mousemove.digilib", dragMove);
 $(document).bind("mouseup.digilib", dragEnd);
 return false;
 };
 var dragMove = function (evt) {
-// mousemove handler: drag
+// mousemove handler: drag zoomed image
 var pos = geom.position(evt);
 dx = pos.x - pt1.x;
 dy = pos.y - pt1.y;
 // move the background image to the new position
-$bg.css({
+$scaler.css({
 'background-position' : dx + "px " + dy + "px"
 });
 return false;
 };
 var dragEnd = function (evt) {
-// mouseup handler: reload digilib
+// mouseup handler: reload zoomed image in new position
-$bg.css({
+$scaler.css({
 'cursor' : 'default'
 });
 $(document).unbind("mousemove.digilib", dragMove);
 $(document).unbind("mouseup.digilib", dragEnd);
 // calculate relative offset
 // digilib.moveBy(x, y);
 var pos = geom.position(-dx, -dy);
 var newPos = data.imgTrafo.invtransform(pos);
 var newArea = data.zoomArea.setPt1(newPos);
 data.zoomArea = MAX_ZOOMAREA.fit(newArea);
-$bg.hide();
 redisplay(data);
 return false;
 };
 $scaler.bind("mousedown.digilib", dragStart);