digilib-old: client/digitallibrary/jquery/jquery.digilib.js comparison

comparison client/digitallibrary/jquery/jquery.digilib.js @ 775:65cdf970934d jquery

minor precisations

author	hertzhaft
date	Fri, 11 Feb 2011 23:11:04 +0100
parents	7e9851ef03d7
children	34bba748004d

comparison

equal deleted inserted replaced

-:6d7c51e4724b
+:65cdf970934d
 'standardSet' : ["reference","zoomin","zoomout","zoomarea","zoomfull","bird","help","reset","toggleoptions"],
 'specialSet' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","scale","toggleoptions"],
 'buttonSets' : ['standardSet', 'specialSet']
 }
 },
 // number of visible button groups
 'visibleButtonSets' : 1,
 // is birdView shown?
 'isBirdDivVisible' : false,
 // dimensions of bird's eye div
 'birdDivWidth' : 200,
 'birdDivHeight' : 200,
 // parameters used by bird's eye div
 'birdDivParams' : ['fn','pn','dw','dh'],
-// style of the zoom area indicator in the bird's eye div
-'birdIndicatorStyle' : {'border' : '2px solid #ff0000' },
-// style of zoom area "rubber band"
-'zoomrectStyle' : {'border' : '2px solid #ff0000' },
 // is the "about" window shown?
 'isAboutDivVisible' : false,
 // maximum width of background image for drag-scroll
 'maxBgSize' : 10000
 // calibrate (only faking)
 calibrate : function (data) {
 loadImageInfo(data);
 },
 // set image scale mode
 setScaleMode : function (data, mode) {
 var oldM = getScaleMode(data);
 if (mode == null) {
 mode = window.prompt("Image scale mode (screen, pixel, size)", oldM);
 setScaleMode(data, mode);
 data.scaleMode = mode;
 redisplay(data);
 }
 }
 // end of actions
 };
 // returns parameters from page url
 var parseQueryParams = function() {
 if (complete != null) {
 complete.call(this, data, json);
 }
 });
 };
 // processes some parameters into objects and stuff
 var unpackParams = function (data) {
 var settings = data.settings;
 // zoom area
 var zoomArea = geom.rectangle(settings.wx, settings.wy, settings.ww, settings.wh);
 renderBirdArea(data);
 setupBirdDrag(data);
 }
 // TODO: update event subscriber?
 };
 // returns maximum size for scaler img in fullscreen mode
 var getFullscreenImgSize = function ($elem) {
 var $win = $(window);
 var winH = $win.height();
 var winW = $win.width();
 data.$birdZoom = $birdZoom;
 data.$birdImg = $birdImg;
 $elem.append($birdDiv);
 $birdDiv.append($birdZoom);
 $birdDiv.append($birdImg);
-$birdZoom.css(data.settings.birdIndicatorStyle);
+// $birdZoom.css(data.settings.birdIndicatorStyle);
 var birdUrl = getBirdImgUrl(data);
 $birdImg.load(birdImgLoadedHandler(data));
 $birdImg.error(function () {console.error("error loading birdview image");});
 $birdImg.attr('src', birdUrl);
 };
 $aboutDiv.append($content);
 $link.append($logo);
 $logo.attr('src', settings.logoUrl);
 $link.attr('href', settings.homeUrl);
 $content.text('Version: ' + settings.version);
+data.$aboutDiv = $aboutDiv;
 // click hides
 $aboutDiv.bind('click.digilib', function () {
-settings.isAboutDivVisible = showDiv(settings.isAboutDivVisible, $aboutDiv, 0);
+actions['showAboutDiv'](data, false);
-return false;
 });
-data.$aboutDiv = $aboutDiv;
 };
 // shows some window e.g. 'about' (toggle visibility if show is null)
 var showDiv = function (isVisible, $div, show) {
 if (show == null) {
 highlight('hmir', flags.hmir);
 highlight('vmir', flags.vmir);
 highlight('quality', flags.q1 || flags.q2);
 highlight('zoomin', ! isFullArea(data.zoomArea));
 };
 // create Transform from area and $img
 var getImgTrafo = function ($img, area, rot, hmir, vmir, mode, imgInfo) {
 var picrect = geom.rectangle($img);
 if (mode != null) {
 if (mode === 'pixel') {
 data.settings.rot, data.scalerFlags.hmir, data.scalerFlags.vmir,
 data.scaleMode, data.imgInfo);
 // console.debug("imgTrafo=", data.imgTrafo);
 }
 };
 // returns function for load event of scaler img
 var scalerImgLoadedHandler = function (data) {
 return function () {
 var $img = $(this);
 console.debug("scaler img loaded=",$img);
 // create Transform from current area and picsize
 data.birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
 var zoomRect = data.birdTrafo.transform(zoomArea);
 console.debug("renderBirdArea:", zoomRect, "zoomArea:", zoomArea, "$birdTrafo:", data.birdTrafo);
 // acount for border width
-zoomRect.addPosition({x : -2, y : -2});
+var bw = getBorderWidth($birdZoom);
+zoomRect.addPosition({x : -bw, y : -bw});
 if (data.settings.interactionMode === 'fullscreen') {
 // no animation for fullscreen
 zoomRect.adjustDiv($birdZoom);
 } else {
 // nice animation for embedded mode :-)
 $elem = data.$elem;
 $scaler = data.$scaler;
 var pt1, pt2;
 var $zoomDiv = $('<div class="zoomrect" style="display:none"/>');
 $elem.append($zoomDiv);
-$zoomDiv.css(data.settings.zoomrectStyle);
+// $zoomDiv.css(data.settings.zoomrectStyle);
 var picRect = geom.rectangle($scaler);
 // FIX ME: is there a way to query the border width from CSS info?
 // rect.x -= 2; // account for overlay borders
 // rect.y -= 2;
 var $birdImg = data.$birdImg;
 var $birdZoom = data.$birdZoom;
 var $document = $(document);
 var $scaler = data.$scaler;
 var startPos, newRect, birdImgRect, birdZoomRect, fullRect, scalerPos;
+var bw = getBorderWidth($birdZoom);
 // mousedown handler: start dragging bird zoom to a new position
 var birdZoomStartDrag = function(evt) {
 startPos = geom.position(evt);
 // position may have changed
 // move the background image to the new position
 data.$scaler.css({
 'background-position' : bgPos.x + "px " + bgPos.y + "px"
 });
 // acount for border width
-newRect.addPosition({x : -2, y : -2});
+newRect.addPosition({x : -bw, y : -bw});
 newRect.adjustDiv($birdZoom);
 return false;
 };
 // mouseup handler: reload page
 // no movement happened - set center to click position
 startPos = birdZoomRect.getCenter();
 birdZoomMove(evt);
 }
 // ugly, but needed to prevent double border width compensation
-newRect.addPosition({x : +2, y : +2});
+newRect.addPosition({x : bw, y : bw});
 var newArea = data.birdTrafo.invtransform(newRect);
 data.zoomArea = newArea;
 redisplay(data);
 return false;
 };
 var setBirdZoom = function(data, rect) {
 var part = data.imgTrafo.invtransform(rect);
 // area = FULL_AREA.fit(part); // no, we want to see where we transcend the borders
 birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
 var birdRect = birdTrafo.transform(part);
+var $birdZoom = data.$birdZoom;
 // acount for border width
-birdRect.addPosition({x : -2, y : -2});
+var bw = getBorderWidth($birdZoom);
+birdRect.addPosition({x : -bw, y : -bw});
 birdRect.adjustDiv(data.$birdZoom);
 };
 // set zoom background
 var setZoomBG = function(data) {
 return 'size';
 }
 // mo=fit is default
 return 'screen';
 };
 // set image scale mode (screen, pixel, size)
 var setScaleMode = function (data, mode) {
 delete data.scalerFlags.fit;
 delete data.scalerFlags.clip;
 delete data.scalerFlags.osize;
 } else if (mode === 'size') {
 data.scalerFlags.osize = 'osize';
 }
 // mo=fit is default
 };
 // sets a key to a value (relative values with +/- if relative=true)
 var setNumValue = function(settings, key, value) {
 if (value == null) return null;
 if (isNumber(value)) {
 settings[key] = value;
 settings[key] = parseFloat(settings[key]) + parseFloat(value);
 } else {
 settings[key] = value;
 }
 return settings[key];
+};
+// auxiliary function, assuming equal border width on all sides
+var getBorderWidth = function($elem) {
+var border = $elem.outerWidth() - $elem.width();
+return border/2;
 };
 // auxiliary function (from old dllib.js)
 var isFullArea = function(area) {
 return (area.width === 1.0) && (area.height === 1.0);