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

comparison client/digitallibrary/jquery/jquery.digilib.js @ 649:fd526464ae87 jquery

beter event handling for setMark...

author	robcast
date	Thu, 20 Jan 2011 14:31:45 +0100
parents	64cc32ec25de
children	0c5930916d53

comparison

equal deleted inserted replaced

-:64cc32ec25de
+:fd526464ae87
 $elem.empty(); // TODO: should we keep stuff for customization?
 var $scaler = $('<div class="scaler"/>');
 $elem.append($scaler);
 $scaler.append($img);
 $img.addClass('pic');
+data.$scaler = $scaler;
 data.$img = $img;
 $img.load(scalerImgLoadedHandler(data));
 };
 // creates HTML structure for buttons in elem
 $a.append($img);
 // add attributes and bindings
 $button.attr('title', actionSettings.tooltip);
 $button.addClass('button-' + actionName);
 // create handler for the buttons
-$a.bind('click', (function () {
+$a.bind('click.digilib', (function () {
 // we create a new closure to capture the value of method
 var method = actionSettings.onclick;
 if ($.isArray(method)) {
 // the handler function calls digilib with method and parameters
-return function () {
+return function (evt) {
-console.debug('click method=', method);
+console.debug('click method=', method, ' evt=', evt);
 $elem.digilib.apply($elem, method);
+return false;
 };
 } else {
 // the handler function calls digilib with method
-return function () {
+return function (evt) {
-console.debug('click method=', method);
+console.debug('click method=', method, ' evt=', evt);
 $elem.digilib(method);
+return false;
 };
 }
 })());
 $img.attr('src', settings.buttonsImagePath + actionSettings.img);
 }
 $link.append($logo);
 $logo.attr('src', settings.logoUrl);
 $link.attr('href', settings.homeUrl);
 $content.text('Version: ' + settings.version);
 // click hides
-$aboutDiv.bind('click', function () {
+$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) {
 // place marks on the image
 var renderMarks = function (data) {
 var $elem = data.$elem;
 var marks = data.marks;
+// TODO: clear marks first(?)
 for (var i = 0; i < marks.length; i++) {
 var mark = marks[i];
 if (data.zoomArea.containsPosition(mark)) {
 var mpos = data.imgTrafo.transform(mark);
 // create mark
 redisplay(data);
 };
 // add a mark where clicked
 var setMark = function (data) {
-var $div = data.$elem;
+var $scaler = data.$scaler;
-var $img = data.$img;
 console.debug("setmark");
 // start event capturing
-$img.one('click.digilib', function (evt) {
+$scaler.one('click.digilib', function (evt) {
 // event handler adding a new mark
 console.debug("setmark.click evt=",evt);
 var mpos = geom.position(evt.pageX, evt.pageY);
 var pos = data.imgTrafo.invtransform(mpos);
 data.marks.push(pos);
 redisplay(data);
-//return stopEvent(evt);
+return false; // do we even get here?
 });
 };
 // auxiliary function (from Douglas Crockford, A.10)
 var isNumber = function isNumber(value) {