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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 703:d16dffcaeee1 jquery

cosmetics

author	hertzhaft
date	Sat, 29 Jan 2011 23:50:06 +0100
parents	89ff5133d1c1
children	1e45fb7f2e8b

comparison

equal deleted inserted replaced

-:89ff5133d1c1
+:d16dffcaeee1
 // create HTML structure for scaler
 setupScalerDiv(data);
 // 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
 setupZoomDrag(data);
 });
 },
 // destroy: clean up digilib
 factor = window.prompt("Contrast (-8, 8)", cont);
 }
 data.settings.cont = factor;
 redisplay(data);
 },
 // display more (or less) button sets
 morebuttons : function (data, more) {
 var settings = data.settings;
 if (more == null) {
 // toggle more or less (only works for 2 sets)
 if (noprompt == null) {
 window.prompt("URL reference to the current view", url);
 }
 return url;
 },
 // set image quality
 setquality : function (data, qual) {
 var oldq = getQuality(data);
 if (qual == null) {
 qual = window.prompt("Image quality (0..2)", oldq);
 };
 // returns parameters from embedded img-element
 var parseImgParams = function($elem) {
 var src = $elem.find('img').first().attr('src');
-if (!src) {
+if (!src) return null;
-return null;
-}
 var pos = src.indexOf('?');
 var query = (pos < 0) ? '' : src.substring(pos + 1);
 var scalerUrl = src.substring(0, pos);
 var params = parseQueryString(query);
 params.scalerBaseUrl = scalerUrl;
 // returns URL and query string for Scaler
 var getScalerUrl = function (data) {
 var settings = data.settings;
 if (settings.scalerBaseUrl == null) {
 alert("ERROR: URL of digilib Scaler servlet missing!");
-}
+};
 packParams(data);
 var keys = settings.scalerParamNames;
 var queryString = getParamString(settings, keys, defaults);
 var url = settings.scalerBaseUrl + '?' + queryString;
 return url;
 var mk = settings.mk;
 if (mk.indexOf(";") >= 0) {
 var pa = mk.split(";");    // old format with ";"
 } else {
 var pa = mk.split(",");    // new format
-}
+};
 for (var i = 0; i < pa.length ; i++) {
 var pos = pa[i].split("/");
 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;
 retrieveOptionsCookie(data);
 };
 // put objects back into parameters
 if (data.zoomArea) {
 settings.wx = cropFloat(data.zoomArea.x);
 settings.wy = cropFloat(data.zoomArea.y);
 settings.ww = cropFloat(data.zoomArea.width);
 settings.wh = cropFloat(data.zoomArea.height);
-}
+};
 // marks
 if (data.marks) {
 settings.mk = '';
 for (var i = 0; i < data.marks.length; i++) {
 if (i) {
 settings.mk += ',';
-}
+};
-settings.mk += cropFloat(data.marks[i].x).toString() + '/' + cropFloat(data.marks[i].y).toString();
+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 += f;
 }
 settings.mo = mo;
 }
+// user interface options
 storeOptionsCookie(data);
 };
 var storeOptionsCookie = function (data) {
 // save digilib options in cookie
 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);
 };
 // update location.href (browser URL) in fullscreen mode
 var url = getDigilibUrl(data);
 var history = window.history;
 if (typeof(history.pushState) === 'function') {
 console.debug("we could modify history, but we don't...");
-}
+};
 window.location = url;
 } else {
 // embedded mode -- just change img src
 var url = getScalerUrl(data);
 data.$img.attr('src', url);
-// and update bird's eye view
+};
-//if (settings.isBirdDivVisible) {
-//    renderBirdZoom(data);
-//}
-};
 };
 // returns maximum size for scaler img in fullscreen mode
 var getFullscreenImgSize = function($elem) {
 var $win = $(window);
 $content.text('Version: ' + settings.version);
 // click hides
 $aboutDiv.bind('click.digilib', function () {
 settings.isAboutDivVisible = showDiv(settings.isAboutDivVisible, $aboutDiv, 0);
 return false;
 });
 data.$aboutDiv = $aboutDiv;
 };
 // shows some window e.g. 'about' (toggle visibility if show is null)
 var showDiv = function (isVisible, $div, show) {
 // toggle visibility
 isVisible = !isVisible;
 } else {
 // set visibility
 isVisible = show;
-}
+};
 if (isVisible) {
 $div.fadeIn();
 } else {
 $div.fadeOut();
-}
+};
 return isVisible;
 };
 // display more (or less) button sets
 var showButtons = function (data, more, setIdx, animated) {
 if (data.$buttonSets && data.$buttonSets[setIdx]) {
 // set exists
 $set = data.$buttonSets[setIdx];
 } else {
 $set = createButtons(data, setIdx);
-}
+};
 if ($set == null) return false;
 var btnWidth = $set.width();
 // move remaining sets left and show new set
 if (animated) {
 $otherSets.animate({left : '-='+btnWidth+'px'}, 'fast',
 function () {$set.show();});
 } else {
 var oldpos = $otherSets.position();
 if (oldpos) {
 $otherSets.css({left : oldpos.left-btnWidth+'px'});
-}
+};
 $set.show();
-}
+};
 } else {
 // remove set
 var $set = data.$buttonSets[setIdx];
 if ($set == null) return false;
 var btnWidth = $set.width();
 var $otherSets = data.$elem.find('div.buttons:visible');
 if (animated) {
 $otherSets.animate({left : '+='+btnWidth+'px'}, 'fast');
 } else {
 $otherSets.css({left : '+='+btnWidth+'px'});
-}
+};
-}
+};
 return true;
 };
 // create Transform from area and $img
 var getImgTrafo = function ($img, area, rot, hmir, vmir) {
 // move [0.5,0.5] to center
 trafo.concat(trafo.getTranslation(geom.position(-0.5, -0.5)));
 if (hmir) {
 // mirror about center
 trafo.concat(trafo.getMirror('y'));
-}
+};
 if (vmir) {
 // mirror about center
 trafo.concat(trafo.getMirror('x'));
-}
+};
 if (rot) {
 // rotate around center
 trafo.concat(trafo.getRotation(parseFloat(rot)));
-}
+};
 // move back
 trafo.concat(trafo.getTranslation(geom.position(0.5, 0.5)));
-}
+};
 // scale to screen position and size
 trafo.concat(trafo.getScale(picrect));
 trafo.concat(trafo.getTranslation(picrect));
 return trafo;
 };
 // create mark
 var html = '<div class="mark">'+(i+1)+'</div>';
 var $mark = $(html);
 $elem.append($mark);
 $mark.offset({left : mpos.x, top : mpos.y});
-}
+};
-}
+};
 };
 // show zoom area indicator on bird's eye view
 var renderbirdZoom = function (data) {
 var $birdZoom = data.$birdZoom;
 // mouseup handler: end moving
 var zoomEnd = function (evt) {
 pt2 = geom.position(evt);
 // assume a click and continue if the area is too small
 var clickRect = geom.rectangle(pt1, pt2);
-if (clickRect.getArea() <= 5) {
+if (clickRect.getArea() <= 5) return false;
-return false;
-}
 // hide zoom div
 $zoomDiv.remove();
 // unregister events
 $elem.unbind("mousemove.digilib", zoomMove);
 $elem.unbind("mouseup.digilib", zoomEnd);
 var $bg = $elem.has('div.bgDrag');
 if ($bg.length === 0) {
 $bg = $('<div class="bgDrag" style="display:none; position:absolute"/>');
 $scaler.before($bg); // set as background
 };
 var dragStart = function (evt) {
 // drag the image and load a new detail on mouse up
 // useless if not zoomed
 if (isFullArea(data.zoomArea)) return false;
 if(evt.preventDefault) evt.preventDefault(); // no Firefox drag and drop (NEEDED?)
 $bg.show();
 $(document).bind("mousemove.digilib", dragMove);
 $(document).bind("mouseup.digilib", dragEnd);
 window.focus();
 };
 var dragMove = function (evt) {
 // mousemove handler: drag
 var pos = geom.position(evt);
 if(evt.preventDefault) evt.preventDefault(); // no Firefox drag and drop (NEEDED?)
 dx = pos.x - pt1.x;
 $bg.css({
 'background-position' : dx + "px " + dy + "px"
 });
 return false;
 };
 var dragEnd = function (evt) {
 // mouseup handler: reload digilib
 $bg.css({
 'cursor' : 'default'
 });
 $(document).unbind("mousemove.digilib", dragMove);
 $(document).unbind("mouseup.digilib", dragEnd);
 // calculate relative offset
-if (dx == 0 && dy == 0)
+if (dx == 0 && dy == 0) return false // no movement
-return false // no movement
 // reload with scaler image showing the new ausschnitt
 // digilib.moveBy(x, y);
 var pos = geom.position(-dx, -dy);
 var newPos = data.imgTrafo.invtransform(pos);
 var newArea = data.zoomArea.setPt1(newPos);
 var setQuality = function (data, qual) {
 var flags = data.scalerFlags;
 // clear flags
 for (var i = 0; i < 3; ++i) {
 delete flags['q'+i];
-}
+};
 flags['q'+qual] = 'q'+qual;
 };
 // 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 isn't perfect but still...
 settings[key] = 0;
-}
+};
 settings[key] = parseFloat(settings[key]) + parseFloat(value);
 } else {
 settings[key] = value;
-}
+};
 return settings[key];
 };
 // auxiliary function (from old dllib.js)
 isFullArea = function(area) {
 return (area.width === 1.0) && (area.height === 1.0);
 };
 // auxiliary function (from Douglas Crockford, A.10)
 var isNumber = function isNumber(value) {
 return typeof value === 'number' && isFinite(value);
 };
 // auxiliary function to crop senseless precision
 var cropFloat = function (x) {
 return parseInt(10000 * x, 10) / 10000;
 } else if (typeof(action) === 'object' || !action) {
 // call init on this
 return actions.init.apply(this, arguments);
 } else {
 $.error( 'action ' + action + ' does not exist on jQuery.digilib' );
-}
+};
 };
 })(jQuery);