comparison client/digitallibrary/jquery/jquery.digilib.js @ 714:667a316edb89 jquery

merge with 823f0050f7eb3e568cf55042b7d5958eecb8854e
author robcast
date Sun, 30 Jan 2011 18:11:07 +0100
parents c1fa722c570e 823f0050f7eb
children c1b1c463bc44
comparison
equal deleted inserted replaced
713:c1fa722c570e 714:667a316edb89
506 $.extend(settings, params); 506 $.extend(settings, params);
507 } 507 }
508 // TODO: should we really reset all user preferences here? 508 // TODO: should we really reset all user preferences here?
509 settings.isBirdDivVisible = false; 509 settings.isBirdDivVisible = false;
510 settings.visibleButtonSets = 1; 510 settings.visibleButtonSets = 1;
511 delete data.dlOpts.fitwidth;
512 delete data.dlOpts.fitheight;
511 redisplay(data); 513 redisplay(data);
512 }, 514 },
513 515
514 // presents a reference url (returns value if noprompt) 516 // presents a reference url (returns value if noprompt)
515 reference : function (data, noprompt) { 517 reference : function (data, noprompt) {
795 var $img, scalerUrl; 797 var $img, scalerUrl;
796 // fullscreen 798 // fullscreen
797 if (settings.interactionMode === 'fullscreen') { 799 if (settings.interactionMode === 'fullscreen') {
798 var imgSize = getFullscreenImgSize($elem); 800 var imgSize = getFullscreenImgSize($elem);
799 // fitwidth/height omits destination height/width 801 // fitwidth/height omits destination height/width
800 if (data.dlOpts.fitheight == null) { 802 if (data.dlOpts.fitheight !== '1') {
801 settings.dw = imgSize.width; 803 settings.dw = imgSize.width;
802 } 804 }
803 if (data.dlOpts.fitwidth == null) { 805 if (data.dlOpts.fitwidth !== '1') {
804 settings.dh = imgSize.height; 806 settings.dh = imgSize.height;
805 } 807 }
806 $img = $('<img/>'); 808 $img = $('<img/>');
807 scalerUrl = getScalerUrl(data); 809 scalerUrl = getScalerUrl(data);
808 // embedded mode -- try to keep img tag 810 // embedded mode -- try to keep img tag