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

comparison client/digitallibrary/jquery/jquery.digilib.geometry.js @ 847:c662bf335881 jquery

fixed a bug in geom.intersect

author	hertzhaft
date	Sun, 06 Mar 2011 12:58:09 +0100
parents	b484631f37c1
children	971b7122930f

comparison

equal deleted inserted replaced

-:dad6a171bc52
+:c662bf335881
 this.setPt2(position(Math.min(this2.x, p2.x), Math.min(this2.y, p2.y)));
 return this;
 };
 // returns the intersection of rectangle "rect" and this one
 that.intersect = function(rect) {
-var res = rect.clipTo(this);
+var r = rect.copy();
-if (res.width < 0 || res.height < 0) res = null;
+var result = r.clipTo(this);
-return res;
+if (result.width < 0 || result.height < 0) result = null;
+return result;
 };
 // returns a copy of rectangle "rect" that fits into this one
 // (moving it first)
 that.fit = function(rect) {
-var sec = rect.copy();
+var r = rect.copy();
-sec.x = Math.max(sec.x, this.x);
+r.x = Math.max(r.x, this.x);
-sec.y = Math.max(sec.y, this.x);
+r.y = Math.max(r.y, this.x);
-if (sec.x + sec.width > this.x + this.width) {
+if (r.x + r.width > this.x + this.width) {
-sec.x = this.x + this.width - sec.width;
+r.x = this.x + this.width - r.width;
 }
-if (sec.y + sec.height > this.y + this.height) {
+if (r.y + r.height > this.y + this.height) {
-sec.y = this.y + this.height - sec.height;
+r.y = this.y + this.height - r.height;
 }
-return sec.intersect(this);
+return r.intersect(this);
 };
 // adjusts position and size of jQuery element "$elem" to this rectangle
 that.adjustDiv = function($elem) {
 $elem.offset({
 left : this.x,