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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 709:fca26721e8dd jquery

fixed some reset and cookie issues

author	hertzhaft
date	Sat, 29 Jan 2011 23:27:39 +0100
parents	120ace160386
children	d533bdf0e64e

comparison

equal deleted inserted replaced

-:120ace160386
+:fca26721e8dd
 // add buttons
 for (var i = 0; i < elemSettings.visibleButtonSets; ++i) {
 showButtons(data, true, i);
 }
 // bird's eye view creation
-if (elemSettings.isBirdDivVisible) {
+if (elemSettings.isBirdDivVisible ) {
 setupBirdDiv(data);
 }
 // about window creation - TODO: could be deferred? restrict to only one item?
 setupAboutDiv(data);
 // TODO: the actual moving code
 // 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
 if (settings.interactionMode === 'fullscreen') {
-settings['fn'] = params.fn;
+settings['fn'] = params.fn || ''; // no default defined
-settings['pn'] = params.pn;
+settings['pn'] = params.pn || defaults.pn;
 // embedded: restore original parameters
 } else {
 $.extend(settings, params);
 };
+// TODO: should we really reset all user preferences here?
+settings.isBirdDivVisible = false;
+settings.visibleButtonSets = 1;
 redisplay(data);
 },
 // presents a reference url (returns value if noprompt)
 reference : function (data, noprompt) {
 for (var i = 0; i < pa.length ; i++) {
 flags[pa[i]] = pa[i];
 }
 }
 data.scalerFlags = flags;
-// clop (digilib options)
+retrieveOptionsCookie(data);
-var opts = {};
-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 (opts.birdview != null) {
-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;
 }
-// save digilib settings in options
+storeOptionsCookie(data);
-data.dlOpts.birdview = settings.isBirdDivVisible ? 1 : 0;
+};
-data.dlOpts.buttons = settings.visibleButtonSets;
+var storeOptionsCookie = function (data) {
 // save digilib options in cookie
 // TODO: in embedded mode this is not called
-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 += o;
 }
 settings.clop = clop;
 } */
-};
+var settings = data.settings;
+if (data.dlOpts) {
+// save digilib settings in options
+data.dlOpts.birdview = settings.isBirdDivVisible ? 1 : 0;
+data.dlOpts.buttons = settings.visibleButtonSets;
+var clop = '';
+for (var o in data.dlOpts) {
+if (clop) {
+clop += '&';
+}
+clop += o + '=' + data.dlOpts[o];
+}
+if (jQuery.cookie) {
+var ck = "digilib:fn:" + escape(settings.fn) + ":pn:" + settings.pn;
+console.debug("set cookie=", ck, " value=", clop);
+jQuery.cookie(ck, clop);
+};
+};
+};
+var retrieveOptionsCookie = function (data) {
+// clop (digilib options)
+var opts = {};
+var settings = data.settings;
+if (jQuery.cookie) {
+/* 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];
+}
+} */
+// 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);
+};
+data.dlOpts = opts;
+// birdview option
+if (opts.birdview != null) {
+settings.isBirdDivVisible = opts.birdview === '1';
+};
+// visible button sets
+if (opts.buttons != null) {
+settings.visibleButtonSets = opts.buttons;
+};
+}
 // clear digilib data for reset
 var resetData = function (data) {
 if (data.zoomArea) delete data.zoomArea;
 if (data.marks) delete data.marks;
 if (data.scalerFlags) delete data.scalerFlags;
-if (data.dlOpts) delete data.dlOpts;
 };
 // (re)load the img from a new scaler URL
 var redisplay = function (data) {
 var settings = data.settings;