Mercurial > hg > digilib-old
changeset 724:c6878e9575fe jquery
merge
with 73cac710bea4534f6ef724df6f92c18f54ebac26
| author | robcast |
|---|---|
| date | Mon, 31 Jan 2011 16:31:40 +0100 |
| parents | 123706249227 (current diff) 73cac710bea4 (diff) |
| children | 936d88972cd0 |
| files | client/digitallibrary/jquery/jquery.digilib.js |
| diffstat | 1 files changed, 10 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/client/digitallibrary/jquery/jquery.digilib.js Mon Jan 31 16:24:31 2011 +0100 +++ b/client/digitallibrary/jquery/jquery.digilib.js Mon Jan 31 16:31:40 2011 +0100 @@ -220,14 +220,14 @@ 'fullscreen' : { // path to button images (must end with a slash) 'imagePath' : 'img/fullscreen/', - 'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","bird","SEP","help","reset","toggleoptions"], - 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","SEP","toggleoptions"], + 'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","bird","help","reset","toggleoptions"], + 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","toggleoptions"], 'buttonSets' : ['standardSet', 'specialSet'] }, 'embedded' : { 'imagePath' : 'img/embedded/16/', - 'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","back","fwd","page","bird","SEP","help","reset","toggleoptions"], - 'specialSet' : ["hmir","vmir","rot","brgt","cont","rgb","quality","size","SEP","toggleoptions"], + 'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","back","fwd","page","bird","help","reset","toggleoptions"], + 'specialSet' : ["hmir","vmir","rot","brgt","cont","rgb","quality","size","toggleoptions"], 'buttonSets' : ['standardSet', 'specialSet'] } }, @@ -788,9 +788,6 @@ // embedded mode -- just change img src var url = getScalerUrl(data); data.$img.attr('src', url); - // set scaler div size explicitly in case $img is hidden (for zoomDrag) - $imgRect = geom.rectangle(data.$img); - $imgRect.adjustDiv(data.$scaler); // load new bird img (in case the scalerUrl has changed, like in gotopage) //showBirdDiv(data); //TODO: change url explicitly } @@ -847,9 +844,6 @@ // 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 @@ -937,7 +931,7 @@ // the bird's eye div var $birdDiv = $('<div class="birdview" style="display:none"/>'); // the detail indicator frame - var $birdZoom = $('<div class="birdZoom" style="display:none; background-color:transparent;"/>'); + var $birdZoom = $('<div class="birdZoom" style="display:none; position:absolute; background-color:transparent;"/>'); // the small image var $birdImg = $('<img class="birdimg"/>'); data.$birdDiv = $birdDiv; @@ -1087,6 +1081,10 @@ data.imgTrafo = getImgTrafo($img, data.zoomArea, data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir); console.debug("imgTrafo=", data.imgTrafo); + // set scaler div size explicitly in case $img is hidden (for zoomDrag) + var $imgRect = geom.rectangle(data.$img); + console.debug("imgrect=", $imgRect); + $imgRect.adjustDiv(data.$scaler); // show image in case it was hidden (for example in zoomDrag) $img.show(); // display marks @@ -1354,6 +1352,7 @@ var dragEnd = function (evt) { // mouseup handler: reload zoomed image in new position $scaler.css({ + 'background-image' : 'none', 'cursor' : 'default' }); $(document).unbind("mousemove.digilib", dragMove);