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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 694:53c75b4bc358 jquery

cookie handling now just in pack/unpackParameters

author	robcast
date	Thu, 27 Jan 2011 19:45:26 +0100
parents	dbd7c7aa575f
children	09e06aa12c0d

comparison

equal deleted inserted replaced

-:dbd7c7aa575f
+:53c75b4bc358
 showBirdDiv : function (data, show) {
 if (data.$birdDiv == null) {
 // no bird div -> create
 setupBirdDiv(data);
 }
-// TODO: keep bird view visible after reload (parameter, cookie?)
 data.settings.isBirdDivVisible = showDiv(data.settings.isBirdDivVisible, data.$birdDiv, show);
-cookie(data, 'birdview', data.settings.isBirdDivVisible ? "1" : "0");
 data.$birdImg.triggerHandler('load');
 },
 // goto given page nr (+/-: relative)
 gotoPage : function (data, pageNr) {
 return params;
 };
 // parses query parameter string into parameter object
 var parseQueryString = function(query) {
+var params = {};
+if (query == null) return params;
 var pairs = query.split("&");
-var params = {};
 //var keys = [];
 for (var i = 0; i < pairs.length; i++) {
 var pair = pairs[i].split("=");
 if (pair.length === 2) {
 params[pair[0]] = pair[1];
 paramString += key + '=' + settings[key];
 }
 }
 return paramString;
 };
-// set/get cookie for current image
-var cookie = function (data, key, value) {
-var settings = data.settings;
-var fn = settings.fn;
-var pn = settings.pn;
-var name = key + ":fn:" + fn + ":pn:" + pn;
-var result = (typeof value === 'undefined') ? $.cookie(name) : $.cookie(name, value, 7);
-console.log("cookie=", name, " value=", $.cookie(name));
-return result;
-};
 // returns URL and query string for Scaler
 var getScalerUrl = function (data) {
 var settings = data.settings;
 if (settings.scalerBaseUrl == null) {
 }
 }
 data.scalerFlags = flags;
 // clop (digilib options)
 var opts = {};
-if (settings.clop) {
+if (jQuery.cookie) {
+// read from cookie
+var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+var cp = jQuery.cookie(ck);
+console.debug("get cookie=", ck, " value=", cp);
+// in query string format
+opts = parseQueryString(cp);
+}
+/* read from parameter clop
+* if (settings.clop) {
 var pa = settings.clop.split(",");
 for (var i = 0; i < pa.length ; i++) {
 opts[pa[i]] = pa[i];
 }
-}
+} */
 data.dlOpts = opts;
 // birdview option
-if (cookie(data, 'birdview') === '1') {
+if (opts.birdview != null) {
-settings.isBirdDivVisible = 1;
+settings.isBirdDivVisible = opts.birdview;
 }
+// visible button sets
+if (opts.buttons != null) {
+settings.visibleButtonSets = opts.buttons;
+}
 };
 // put objects back into parameters
 var packParams = function (data) {
 var settings = data.settings;
 }
 mo += f;
 }
 settings.mo = mo;
 }
-// digilib option birdview
+// save digilib settings in options
-// cookie(data, 'birdview', settings.isBirdDivVisible ? "1" : "0");
+data.dlOpts.birdview = settings.isBirdDivVisible ? 1 : 0;
+data.dlOpts.buttons = settings.visibleButtonSets;
-// digilib options
+// save digilib options in cookie
 if (data.dlOpts) {
 var clop = '';
 for (var o in data.dlOpts) {
 if (clop) {
+clop += '&';
+}
+clop += o + '=' + data.dlOpts[o];
+}
+var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+console.debug("set cookie=", ck, " value=", clop);
+jQuery.cookie(ck, clop);
+};
+/* store in parameter clop
+* if (data.dlOpts) {
+var clop = '';
+for (var o in data.dlOpts) {
+if (clop) {
 clop += ',';
 }
 clop += o;
 }
 settings.clop = clop;
-}
+} */
 };
 // clear digilib data for reset
 var resetData = function (data) {
 if (data.zoomArea) delete data.zoomArea;
 // move remaining sets left and show new set
 if (animated) {
 $otherSets.animate({left : '-='+btnWidth+'px'}, 'fast',
 function () {$set.show();});
 } else {
-$otherSets.css({left : '-='+btnWidth+'px'});
+var oldpos = $otherSets.position();
+if (oldpos) {
+$otherSets.css({left : oldpos.left-btnWidth+'px'});
+}
 $set.show();
 }
 } else {
 // remove set
 var $set = data.$buttonSets[setIdx];