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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 735:790a7673bef0 jquery

improved some embedded buttons; fixed reset function

author	hertzhaft
date	Wed, 02 Feb 2011 00:24:22 +0100
parents	25f2898696a2
children	54928116a7b2

comparison

equal deleted inserted replaced

-:25f2898696a2
+:790a7673bef0
 'specialSet' : ["hmir","vmir","rot","brgt","cont","rgb","quality","size","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,
 };
 // affine geometry classes
 var geom = dlGeometry();
-var MAX_ZOOMAREA = geom.rectangle(0, 0, 1, 1);
+var FULL_AREA = geom.rectangle(0, 0, 1, 1);
 var actions = {
 // init: digilib initialization
 init : function(options) {
 // settings for this digilib instance are merged from defaults and options
 setupBirdDiv(data);
 data.$birdDiv.show();
 }
 // about window creation - TODO: could be deferred? restrict to only one item?
 setupAboutDiv(data);
-// TODO: the actual moving code
+// drag zoom area around in scaler div
 setupZoomDrag(data);
 });
 },
 // destroy: clean up digilib
 return false;
 }
 }
 // reset mk and others(?)
 data.marks = [];
-data.zoomArea = MAX_ZOOMAREA;
+data.zoomArea = FULL_AREA;
 // then reload
 redisplay(data);
 },
 // zoom by a given factor
 zoomArea(data);
 },
 // zoom out to full page
 zoomFull : function (data, mode) {
-data.zoomArea = MAX_ZOOMAREA;
+data.zoomArea = FULL_AREA;
 if (mode === 'width') {
 data.dlOpts.fitwidth = 1;
 delete data.dlOpts.fitheight;
 } else if (mode === 'height') {
 data.dlOpts.fitheight = 1;
 // reset image parameters to defaults
 reset : function (data) {
 var settings = data.settings;
 var paramNames = settings.digilibParamNames;
 var params = data.queryParams;
-// resets zoomArea, marks, scalerflags
-resetData(data);
 // delete all digilib parameters
 for (var i = 0; i < paramNames.length; i++) {
 var paramName = paramNames[i];
 delete settings[paramName];
 }
-// fullscreen: restore only fn/pn parameters
+settings.fn = params.fn || ''; // no default defined
-if (settings.interactionMode === 'fullscreen') {
+settings.pn = params.pn || defaults.pn;
-settings.fn = params.fn || ''; // no default defined
+settings.dw = params.dw;
-settings.pn = params.pn || defaults.pn;
+settings.dh = params.dh;
-// embedded: restore original parameters
-} else {
-$.extend(settings, params);
-}
-// TODO: should we really reset all user preferences here?
 settings.isBirdDivVisible = false;
 settings.visibleButtonSets = 1;
+// resets zoomArea, marks, scalerflags
+data.zoomArea = FULL_AREA;
+data.marks = [];
+data.scalerFlags = {};
 delete data.dlOpts.fitwidth;
 delete data.dlOpts.fitheight;
 redisplay(data);
 },
 }
 // visible button sets
 if (opts.buttons != null) {
 settings.visibleButtonSets = opts.buttons;
 }
-};
-// clear digilib data for reset
-var resetData = function (data) {
-// TODO: we should reset instead of delete
-if (data.zoomArea) delete data.zoomArea;
-if (data.marks) delete data.marks;
-if (data.scalerFlags) delete data.scalerFlags;
 };
 // (re)load the img from a new scaler URL
 var redisplay = function (data) {
 var settings = data.settings;
 var birdImgLoadedHandler = function (data) {
 return function () {
 var $img = $(this);
 console.debug("birdimg loaded! this=", this, " data=", data);
 // create Transform from current area and picsize
-data.birdTrafo = getImgTrafo($img, MAX_ZOOMAREA);
+data.birdTrafo = getImgTrafo($img, FULL_AREA);
 // display red indicator around zoomarea
 renderBirdArea(data);
 // enable click and drag
 setupBirdDrag(data);
 };
 return;
 } else {
 $birdZoom.show();
 }
 // position may have changed
-data.birdTrafo = getImgTrafo(data.$birdImg, MAX_ZOOMAREA);
+data.birdTrafo = getImgTrafo(data.$birdImg, FULL_AREA);
 var indRect = data.birdTrafo.transform(zoomArea);
 var coords = {
 left : indRect.x-2, // acount for frame width
 top : indRect.y-2,
 width : indRect.width,
 newarea.width /= factor;
 newarea.height /= factor;
 // and recenter
 newarea.x -= 0.5 * (newarea.width - area.width);
 newarea.y -= 0.5 * (newarea.height - area.height);
-newarea = MAX_ZOOMAREA.fit(newarea);
+newarea = FULL_AREA.fit(newarea);
 data.zoomArea = newarea;
 redisplay(data);
 };
 // add a mark where clicked
 // mousedown handler: start dragging bird zoom to a new position
 var birdZoomStartDrag = function(evt) {
 startPos = geom.position(evt);
 // position may have changed
-data.birdTrafo = getImgTrafo($birdImg, MAX_ZOOMAREA);
+data.birdTrafo = getImgTrafo($birdImg, FULL_AREA);
 birdImgRect = geom.rectangle($birdImg);
 birdZoomRect = geom.rectangle($birdZoom);
 $document.bind("mousemove.dlBirdMove", birdZoomMove);
 $document.bind("mouseup.dlBirdMove", birdZoomEndDrag);
 $birdZoom.bind("mousemove.dlBirdMove", birdZoomMove);
 $birdZoom.bind("mouseup.dlBirdMove", birdZoomEndDrag);
 return false;
 };
 // clear old handler
 $document.unbind(".dlBirdMove");
 $birdImg.unbind(".dlBirdMove");
 $birdZoom.unbind(".dlBirdMove");
 if (! isFullArea(data.zoomArea)) {
 var za = data.imgTrafo.transform(data.zoomArea);
 // move
 za.addPosition(delta);
 // transform back
 var newArea = data.imgTrafo.invtransform(za);
-data.zoomArea = MAX_ZOOMAREA.fit(newArea);
+data.zoomArea = FULL_AREA.fit(newArea);
 redisplay(data);
 return false;
 };
 // clear old handler
 $document.unbind(".dlZoomDrag");
 $scaler.unbind(".dlBirdMove");
 if (! isFullArea(data.zoomArea)) {
 // set new handler