Mercurial > hg > digilib-old
comparison client/digitallibrary/jquery/jquery.digilib.js @ 720:4f96149cf584 jquery
adjust size of scalerDiv only when img loaded
| author | hertzhaft |
|---|---|
| date | Mon, 31 Jan 2011 10:16:30 +0100 |
| parents | 3da6db751448 |
| children | dccff3759699 |
comparison
equal
deleted
inserted
replaced
| 719:3da6db751448 | 720:4f96149cf584 |
|---|---|
| 782 window.location = url; | 782 window.location = url; |
| 783 } else { | 783 } else { |
| 784 // embedded mode -- just change img src | 784 // embedded mode -- just change img src |
| 785 var url = getScalerUrl(data); | 785 var url = getScalerUrl(data); |
| 786 data.$img.attr('src', url); | 786 data.$img.attr('src', url); |
| 787 // set scaler div size explicitly in case $img is hidden (for zoomDrag) | |
| 788 $imgRect = geom.rectangle(data.$img); | |
| 789 $imgRect.adjustDiv(data.$scaler); | |
| 790 // load new bird img (in case the scalerUrl has changed, like in gotopage) | 787 // load new bird img (in case the scalerUrl has changed, like in gotopage) |
| 791 showBirdDiv(data); | 788 showBirdDiv(data); |
| 792 } | 789 } |
| 793 }; | 790 }; |
| 794 | 791 |
| 1073 console.debug("img loaded! this=", this, " data=", data); | 1070 console.debug("img loaded! this=", this, " data=", data); |
| 1074 // create Transform from current area and picsize | 1071 // create Transform from current area and picsize |
| 1075 data.imgTrafo = getImgTrafo($img, data.zoomArea, | 1072 data.imgTrafo = getImgTrafo($img, data.zoomArea, |
| 1076 data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir); | 1073 data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir); |
| 1077 console.debug("imgTrafo=", data.imgTrafo); | 1074 console.debug("imgTrafo=", data.imgTrafo); |
| 1075 // set scaler div size explicitly in case $img is hidden (for zoomDrag) | |
| 1076 var $imgRect = geom.rectangle(data.$img); | |
| 1077 console.debug("imgrect=", $imgRect); | |
| 1078 $imgRect.adjustDiv(data.$scaler); | |
| 1078 // show image in case it was hidden (for example in zoomDrag) | 1079 // show image in case it was hidden (for example in zoomDrag) |
| 1079 $img.show(); | 1080 $img.show(); |
| 1080 // display marks | 1081 // display marks |
| 1081 renderMarks(data); | 1082 renderMarks(data); |
| 1082 // TODO: digilib.showArrows(); // show arrow overlays for zoom navigation | 1083 // TODO: digilib.showArrows(); // show arrow overlays for zoom navigation |