# HG changeset patch
# User hertzhaft
# Date 1295271317 -3600
# Node ID cc3d81f02d4e82a45f950db4c768ed7ddeefc03c
# Parent 533b06116a48d69f1b01a7ec9c618e0684a99436
factored out display function
diff -r 533b06116a48 -r cc3d81f02d4e client/digitallibrary/jquery/jquery.digilib.js
--- a/client/digitallibrary/jquery/jquery.digilib.js Mon Jan 17 14:19:00 2011 +0100
+++ b/client/digitallibrary/jquery/jquery.digilib.js Mon Jan 17 14:35:17 2011 +0100
@@ -326,6 +326,13 @@
return geom.size(winW, winH);
};
+ // (re)load the img from a new scaler URL
+ var display = function ($img, settings) {
+ var scalerUrl = getScalerString(settings);
+ $img.attr('src', scalerUrl);
+ $img.load(scalerImgLoadedFn(settings));
+ };
+
// creates HTML structure for digilib in elem
var setupScalerDiv = function ($elem, settings) {
var rewrite;
@@ -335,21 +342,16 @@
settings.dw = imgSize.width;
settings.dh = imgSize.height;
$img = $('');
- var scalerUrl = getScalerString(settings);
- $img.attr('src', scalerUrl);
- $img.addClass('pic');
+ display($img, settings);
} else {
// embedded mode -- try to keep img tag
var $img = $elem.find('img');
if ($img.length > 0) {
console.debug("img detach:",$img);
$img.detach();
- $img.addClass('pic');
} else {
$img = $('
');
- var scalerUrl = getScalerString(settings);
- $img.attr('src', scalerUrl);
- $img.addClass('pic');
+ display($img, settings);
}
}
// create new html
@@ -357,7 +359,7 @@
var $scaler = $('