digilib: client/digitallibrary/greyskin/baselib.js comparison

comparison client/digitallibrary/greyskin/baselib.js @ 509:8652a5837432

fixed bug with double-zoom (Transform was broken for Rectangles)

author	robcast
date	Thu, 03 Sep 2009 13:10:00 +0200
parents	23195b070d30
children

comparison

equal deleted inserted replaced

-:3713396e43e9
+:8652a5837432
 Authors:
 Christian Luginbuehl, 01.05.2003 (first version)
 DW 24.03.2004 (Changed for digiLib in Zope)
 Robert Casties, 2.11.2004 (almost complete rewrite)
 Martin Raspe, 12.12.2005 (changes for Digilib NG)
+Robert Casties, 3.9.2009
 */
 // was: function base_init() {
-baseLibVersion = "2.010";
+baseLibVersion = "2.011";
 browserType = getBrowserType();
 sliders = {};
 activeSlider = null;
 Transform.prototype.transform = function(rect) {
 // returns transformed Rectangle or Position with this Transform applied
 var x = this.m00 * rect.x + this.m01 * rect.y + this.m02;
 var y = this.m10 * rect.x + this.m11 * rect.y + this.m12;
 if (rect.width) {
-var width = this.m00 * rect.width + this.m01 * rect.height;
+// transform the other corner points
-var height = this.m10 * rect.width + this.m11 * rect.height;
+var pt2 = rect.getPt2();
+var x2 = this.m00 * pt2.x + this.m01 * pt2.y + this.m02;
+var y2 = this.m10 * pt2.x + this.m11 * pt2.y + this.m12;
+var width = x2 - x;
+var height = y2 - y;
 return new Rectangle(x, y, width, height);
 }
 return new Position(x, y);
 }
-Transform.prototype.invtransform = function(pos) {
+Transform.prototype.invtransform = function(rect) {
-// returns transformed Position pos with the inverse of this Transform applied
+// returns transformed Rectangle or Position with the inverse of this Transform applied
 var det = this.m00 * this.m11 - this.m01 * this.m10;
-var x = (this.m11 * pos.x - this.m01 * pos.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
+var x = (this.m11 * rect.x - this.m01 * rect.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
-var y = (- this.m10 * pos.x + this.m00 * pos.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
+var y = (- this.m10 * rect.x + this.m00 * rect.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
-if (pos.width) {
+if (rect.width) {
-var width = (this.m11 * pos.width - this.m01 * pos.height - this.m11 * this.m02 + this.m01 * this.m12) / det;
+/* transforming width and height like points seems to be wrong
-		var height = (- this.m10 * pos.width + this.m00 * pos.height + this.m10 * this.m02 - this.m00 * this.m12) / det;
+var width = (this.m11 * rect.width - this.m01 * rect.height - this.m11 * this.m02 + this.m01 * this.m12) / det;
-		return new Rectangle(x, y, width, height);
+var height = (- this.m10 * rect.width + this.m00 * rect.height + this.m10 * this.m02 - this.m00 * this.m12) / det;
-	}
+*/
+// transform the other corner points
+var pt2 = rect.getPt2();
+var x2 = (this.m11 * pt2.x - this.m01 * pt2.y - this.m11 * this.m02 + this.m01 * this.m12) / det;
+var y2 = (- this.m10 * pt2.x + this.m00 * pt2.y + this.m10 * this.m02 - this.m00 * this.m12) / det;
+var width = x2 - x;
+var height = y2 - y;
+return new Rectangle(x, y, width, height);
+}
 return new Position(x, y);
 }
 function getRotation(angle, pos) {
 // returns a Transform that is a rotation by angle degrees around [pos.x, pos.y]
 var traf = new Transform();
 var x = 0;
 var y = 0;
 if (defined(elem.offsetLeft)) {
 var e = elem;
 while (e) {
-if (defined(e.clientLeft)) {
+if (browserType.isIE) {
-// special for IE
 if (browserType.isMac) {
 if (e.offsetParent.tagName == "BODY") {
 // IE for Mac extraspecial
 x += e.clientLeft;
 y += e.clientTop;
 x += e.offsetLeft;
 y += e.offsetTop;
 e = e.offsetParent;
 }
 } else if (defined(elem.x)) {
+// use .x for other (which?)
 x = elem.x;
 y = elem.y;
 } else if (defined(elem.pageX)) {
+// use pageX for N4
 x = elem.pageX;
 y = elem.pageY;
 } else {
 alert("unable to get position of " + elem + " (id:" + elem.id + ")");
 }
 // returns a Size with the current window size (mostly from www.quirksmode.org)
 var wsize = new Size(100, 100);
 if (defined(self.innerHeight))  {
 // all except Explorer
 if ((self.innerWidth == 0)||(self.innerHeight == 0)) {
-// Safari 1.2 bug
+// Safari 1.2 (and other) bug
 if (parent) {
-parent.innerHeight;
+wsize.height = parent.innerHeight;
-parent.innerWidth;
+wsize.width = parent.innerWidth;
 }
-}
+} else {
 wsize.width = self.innerWidth;
 wsize.height = self.innerHeight;
+}
 } else if (document.documentElement && document.documentElement.clientHeight) {
 // Explorer 6 Strict Mode
 wsize.width = document.documentElement.clientWidth;
 wsize.height = document.documentElement.clientHeight;
 } else if (document.body) {