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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 650:0c5930916d53 jquery

zoom to page width works now added clop (= data.dlOpts) client side options parameter also added infrastructure for mo Scaler options

author	robcast
date	Thu, 20 Jan 2011 19:04:56 +0100
parents	fd526464ae87
children	694bdb86cbad

comparison

equal deleted inserted replaced

-:fd526464ae87
+:0c5930916d53
 onclick : "javascript:zoomArea()",
 tooltip : "zoom area",
 img : "zoom-area.png"
 },
 zoomfull : {
-onclick : "zoomFullpage",
+onclick : "zoomFull",
 tooltip : "view the whole image",
 img : "zoom-full.png"
 },
 pagewidth : {
-onclick : "javascript:zoomFullpage('width')",
+onclick : ["zoomFull", "width"],
 tooltip : "page width",
 img : "pagewidth.png"
 },
 back : {
 onclick : ["gotoPage", "-1"],
 onclick : "setMark",
 tooltip : "set a mark",
 img : "mark.png"
 },
 delmark : {
-onclick : "javascript:removeMark()",
+onclick : "removeMark",
 tooltip : "delete the last mark",
 img : "delmark.png"
 },
 hmir : {
 onclick : "javascript:mirror('h')",
 'rgba' : '0/0/0',
 'ddpi' : null,
 'ddpix' : null,
 'ddpiy' : null,
 // list of digilib parameters
-'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba',
+'digilibParamNames' : ['fn','pn','ww','wh','wx','wy','ws','mo','rot','cont','brgt','rgbm','rgba','mk','clop'],
-'mk'],
 // digilib parameter defaults
 'mk' : '',
+'clop' : '',
 // mode of operation:
 // fullscreen = take parameters from page URL, keep state in page URL
 // embedded = take parameters from Javascript options, keep state inside object
 'interactionMode' : 'fullscreen',
 // actions
 'actions' : actions,
 // path to button images (must end with a slash)
 'buttonsImagePath' : '../greyskin/',
 // actions groups
-'actionsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","mark","back","fwd","page","bird","SEP","help","reset","options"],
+//'actionsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","back","fwd","page","bird","SEP","help","reset","options"],
+'actionsStandard' : ["reference","zoomin","zoomout","zoomarea","zoomfull","pagewidth","mark","delmark","back","fwd","page","bird","SEP","help","reset","options"],
 'actionsSpecial' : ["mark","delmark","hmir","vmir","rot","brgt","cont","rgb","quality","size","calibrationx","scale","SEP","options"],
 'actionsCustom' : [],
 // is birdView shown?
 'isBirdDivVisible' : false,
 // dimensions of bird's eye window
 var data = $elem.data('digilib');
 zoomBy(data, factor);
 },
 // zoom out to full page
-zoomFullpage : function () {
+zoomFull : function (mode) {
 var $elem = $(this);
 var data = $elem.data('digilib');
 data.zoomArea = MAX_ZOOMAREA;
+if (mode === 'width') {
+data.dlOpts.fitwidth = 1;
+delete data.dlOpts.fitheight;
+} else if (mode === 'height') {
+data.dlOpts.fitheight = 1;
+delete data.dlOpts.fitwidth;
+} else {
+delete data.dlOpts.fitwidth;
+delete data.dlOpts.fitheight;
+}
 redisplay(data);
 },
 // set a mark by clicking (or giving a position)
 setMark : function (mpos) {
 } else {
 // use position
 data.marks.push(pos);
 redisplay(data);
 }
-}
+},
-};
+// remove the last mark
-// sets a key to a value (relative values with +/- if relative=true)
+removeMark : function () {
-var setNumValue = function(settings, key, value) {
+var $elem = $(this);
-if (isNumber(value)) return settings[key] = value;
+var data = $elem.data('digilib');
-var sign = value.substring(0,1);
+data.marks.pop();
-if (sign === '+' || sign === '-') {
+redisplay(data);
-if (settings[key] == null) {
+}
-// this doesn't make much sense but still...
-settings[key] = 0;
+};
-}
-settings[key] = parseFloat(settings[key]) + parseFloat(value);
-} else {
-		settings[key] = value;
-}
-	return settings[key];
-};
 // returns parameters from page url
 var parseQueryParams = function() {
 return parseQueryString(window.location.search.slice(1));
 };
 };
 // returns a query string from key names from a parameter hash (ignoring if the same value is in defaults)
 var getParamString = function (settings, keys, defaults) {
 var paramString = '';
-var latter = false;
+var nx = false;
 for (i = 0; i < keys.length; ++i) {
 var key = keys[i];
 if ((settings[key] != null) && ((defaults == null) || (settings[key] !== defaults[key]))) {
 // first param gets no '&'
-paramString += latter ? '&' : '';
+if (nx) {
-latter = true;
+paramString += '&';
+} else {
+nx = true;
+}
 // add parm=val
 paramString += key + '=' + settings[key];
 }
 }
 return paramString;
 // zoom area
 var zoomArea = geom.rectangle(settings.wx, settings.wy, settings.ww, settings.wh);
 data.zoomArea = zoomArea;
 // marks
 var marks = [];
-var mk = settings.mk || '';
+if (settings.mk) {
-if (mk.indexOf(";") >= 0) {
+var mk = settings.mk;
-var pa = mk.split(";");    // old format with ";"
+if (mk.indexOf(";") >= 0) {
-} else {
+var pa = mk.split(";");    // old format with ";"
-var pa = mk.split(",");    // new format
+} else {
-}
+var pa = mk.split(",");    // new format
-for (var i = 0; i < pa.length ; i++) {
+}
-var pos = pa[i].split("/");
+for (var i = 0; i < pa.length ; i++) {
-if (pos.length > 1) {
+var pos = pa[i].split("/");
-marks.push(geom.position(pos[0], pos[1]));
+if (pos.length > 1) {
+marks.push(geom.position(pos[0], pos[1]));
+}
 }
 }
 data.marks = marks;
+// mo (Scaler flags)
+var flags = {};
+if (settings.mo) {
+var pa = settings.mo.split(",");
+for (var i = 0; i < pa.length ; i++) {
+flags[pa[i]] = pa[i];
+}
+}
+data.scalerFlags = flags;
+// clop (digilib options)
+var opts = {};
+if (settings.clop) {
+var pa = settings.clop.split(",");
+for (var i = 0; i < pa.length ; i++) {
+opts[pa[i]] = pa[i];
+}
+}
+data.dlOpts = opts;
 };
 // put objects back into parameters
 var packParams = function (data) {
 var settings = data.settings;
 settings.ww = cropFloat(data.zoomArea.width);
 settings.wh = cropFloat(data.zoomArea.height);
 }
 // marks
 if (data.marks) {
-var ma = [];
+settings.mk = '';
 for (var i = 0; i < data.marks.length; i++) {
-ma.push(cropFloat(data.marks[i].x) + "/" + cropFloat(data.marks[i].y));
+if (i) {
-}
+settings.mk += ',';
-settings.mk = ma.join(",");
+}
+settings.mk += cropFloat(data.marks[i].x).toString() + '/' + cropFloat(data.marks[i].y).toString();
+}
+}
+// Scaler flags
+if (data.scalerFlags) {
+var mo = '';
+for (var f in data.scalerFlags) {
+if (mo) {
+mo += ',';
+}
+mo += f;
+}
+settings.mo = mo;
+}
+// digilib options
+if (data.dlOpts) {
+var clop = '';
+for (var o in data.dlOpts) {
+if (clop) {
+clop += ',';
+}
+clop += o;
+}
+settings.clop = clop;
 }
 };
 // returns maximum size for scaler img in fullscreen mode
 var getFullscreenImgSize = function($elem) {
 var $elem = data.$elem;
 var $img;
 if (settings.interactionMode === 'fullscreen') {
 // fullscreen
 var imgSize = getFullscreenImgSize($elem);
-settings.dw = imgSize.width;
+// fitwidth/height omits destination height/width
-settings.dh = imgSize.height;
+if (data.dlOpts['fitheight'] == null) {
+settings.dw = imgSize.width;
+}
+if (data.dlOpts['fitwidth'] == null) {
+settings.dh = imgSize.height;
+}
 $img = $('<img/>');
 var scalerUrl = getScalerUrl(data);
 $img.attr('src', scalerUrl);
 } else {
 // embedded mode -- try to keep img tag
 redisplay(data);
 return false; // do we even get here?
 });
 };
+// sets a key to a value (relative values with +/- if relative=true)
+var setNumValue = function(settings, key, value) {
+if (isNumber(value)) return settings[key] = value;
+var sign = value.substring(0,1);
+if (sign === '+' || sign === '-') {
+if (settings[key] == null) {
+// this doesn't make much sense but still...
+settings[key] = 0;
+}
+settings[key] = parseFloat(settings[key]) + parseFloat(value);
+} else {
+settings[key] = value;
+}
+return settings[key];
+};
 // auxiliary function (from Douglas Crockford, A.10)
 var isNumber = function isNumber(value) {
 return typeof value === 'number' && isFinite(value);
 };