Mercurial > hg > digilib-old
comparison client/digitallibrary/jquery/jquery.digilib.js @ 712:823f0050f7eb jquery
'reset' should reset fitwidth/fitheight, too
author | hertzhaft |
---|---|
date | Sun, 30 Jan 2011 16:38:54 +0100 |
parents | eab17859be79 |
children | 667a316edb89 |
comparison
equal
deleted
inserted
replaced
711:eab17859be79 | 712:823f0050f7eb |
---|---|
485 $.extend(settings, params); | 485 $.extend(settings, params); |
486 }; | 486 }; |
487 // TODO: should we really reset all user preferences here? | 487 // TODO: should we really reset all user preferences here? |
488 settings.isBirdDivVisible = false; | 488 settings.isBirdDivVisible = false; |
489 settings.visibleButtonSets = 1; | 489 settings.visibleButtonSets = 1; |
490 delete data.dlOpts.fitwidth; | |
491 delete data.dlOpts.fitheight; | |
490 redisplay(data); | 492 redisplay(data); |
491 }, | 493 }, |
492 | 494 |
493 // presents a reference url (returns value if noprompt) | 495 // presents a reference url (returns value if noprompt) |
494 reference : function (data, noprompt) { | 496 reference : function (data, noprompt) { |
774 var $img, scalerUrl; | 776 var $img, scalerUrl; |
775 // fullscreen | 777 // fullscreen |
776 if (settings.interactionMode === 'fullscreen') { | 778 if (settings.interactionMode === 'fullscreen') { |
777 var imgSize = getFullscreenImgSize($elem); | 779 var imgSize = getFullscreenImgSize($elem); |
778 // fitwidth/height omits destination height/width | 780 // fitwidth/height omits destination height/width |
779 if (data.dlOpts['fitheight'] == null) { | 781 if (data.dlOpts['fitheight'] !== '1') { |
780 settings.dw = imgSize.width; | 782 settings.dw = imgSize.width; |
781 }; | 783 }; |
782 if (data.dlOpts['fitwidth'] == null) { | 784 if (data.dlOpts['fitwidth'] !== '1') { |
783 settings.dh = imgSize.height; | 785 settings.dh = imgSize.height; |
784 }; | 786 }; |
785 $img = $('<img/>'); | 787 $img = $('<img/>'); |
786 scalerUrl = getScalerUrl(data); | 788 scalerUrl = getScalerUrl(data); |
787 // embedded mode -- try to keep img tag | 789 // embedded mode -- try to keep img tag |