Mercurial > hg > digilib-old
comparison client/digitallibrary/jquery/jquery.digilib.js @ 722:73cac710bea4 jquery
still the strange bug when dragging the zoomed image in embedded mode
author | hertzhaft |
---|---|
date | Mon, 31 Jan 2011 16:22:39 +0100 |
parents | dccff3759699 |
children | c6878e9575fe |
comparison
equal
deleted
inserted
replaced
721:dccff3759699 | 722:73cac710bea4 |
---|---|
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 // 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) |
788 showBirdDiv(data); | 788 showBirdImage(data); |
789 } | 789 } |
790 }; | 790 }; |
791 | 791 |
792 // returns maximum size for scaler img in fullscreen mode | 792 // returns maximum size for scaler img in fullscreen mode |
793 var getFullscreenImgSize = function($elem) { | 793 var getFullscreenImgSize = function($elem) { |
838 data.$scaler = $scaler; | 838 data.$scaler = $scaler; |
839 data.$img = $img; | 839 data.$img = $img; |
840 // setup image load handler before setting the src attribute (IE bug) | 840 // setup image load handler before setting the src attribute (IE bug) |
841 $img.load(scalerImgLoadedHandler(data)); | 841 $img.load(scalerImgLoadedHandler(data)); |
842 $img.attr('src', scalerUrl); | 842 $img.attr('src', scalerUrl); |
843 // set scaler div size explicitly in case $img is hidden (for zoomDrag) | |
844 $imgRect = geom.rectangle($img); | |
845 $imgRect.adjustDiv(data.$scaler); | |
846 }; | 843 }; |
847 | 844 |
848 // creates HTML structure for buttons in elem | 845 // creates HTML structure for buttons in elem |
849 var createButtons = function (data, buttonSetIdx) { | 846 var createButtons = function (data, buttonSetIdx) { |
850 var $elem = data.$elem; | 847 var $elem = data.$elem; |
925 $birdZoom.css(data.settings.birdIndicatorStyle); | 922 $birdZoom.css(data.settings.birdIndicatorStyle); |
926 data.$birdDiv = $birdDiv; | 923 data.$birdDiv = $birdDiv; |
927 data.$birdZoom = $birdZoom; | 924 data.$birdZoom = $birdZoom; |
928 data.$birdImg = $birdImg; | 925 data.$birdImg = $birdImg; |
929 $birdImg.load(birdImgLoadedHandler(data)); | 926 $birdImg.load(birdImgLoadedHandler(data)); |
930 showBirdDiv(data); | 927 showBirdImage(data); |
931 birdZoom(data); | 928 birdZoom(data); |
932 }; | 929 }; |
933 | 930 |
934 // puts correct img into bird div | 931 // puts correct img into bird div |
935 var showBirdDiv = function (data) { | 932 var showBirdImage = function (data) { |
933 var $birdDiv = data.$birdDiv; | |
934 if ($birdDiv == null) return null; | |
936 var settings = data.settings; | 935 var settings = data.settings; |
937 var $birdImg = data.$birdImg; | 936 var $birdImg = data.$birdImg; |
938 var $birdDiv = data.$birdDiv; | |
939 var birdDivOptions = { | 937 var birdDivOptions = { |
940 dw : settings.birdDivWidth, | 938 dw : settings.birdDivWidth, |
941 dh : settings.birdDivHeight | 939 dh : settings.birdDivHeight |
942 }; | 940 }; |
943 var birdSettings = $.extend({}, settings, birdDivOptions); | 941 var birdSettings = $.extend({}, settings, birdDivOptions); |
1348 }; | 1346 }; |
1349 | 1347 |
1350 var dragEnd = function (evt) { | 1348 var dragEnd = function (evt) { |
1351 // mouseup handler: reload zoomed image in new position | 1349 // mouseup handler: reload zoomed image in new position |
1352 $scaler.css({ | 1350 $scaler.css({ |
1351 'background-image' : 'none', | |
1353 'cursor' : 'default' | 1352 'cursor' : 'default' |
1354 }); | 1353 }); |
1355 $(document).unbind("mousemove.digilib", dragMove); | 1354 $(document).unbind("mousemove.digilib", dragMove); |
1356 $(document).unbind("mouseup.digilib", dragEnd); | 1355 $(document).unbind("mouseup.digilib", dragEnd); |
1357 // calculate relative offset | 1356 // calculate relative offset |