X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdimensions%2Fdimensions.js;h=1a8e87a1233449f749d694f01bcaac149311d8b1;hb=af961d58c244224c14f3bb519214485cb670c64d;hp=cc248202e666f9d4aa364df29ecce9be325caad4;hpb=514aef10d785165704d49f780fc6fe20eb4ec690;p=jquery.git

diff --git a/src/dimensions/dimensions.js b/src/dimensions/dimensions.js
index cc24820..1a8e87a 100644
--- a/src/dimensions/dimensions.js
+++ b/src/dimensions/dimensions.js
@@ -6,160 +6,307 @@
 /**
  * Returns the css height value for the first matched element.
  * If used on document, returns the document's height (innerHeight)
- * If used on window, returns the viewports (window's) height
+ * If used on window, returns the viewport's (window) height
  *
  * @example $("#testdiv").height()
- * @result [ 200px ]
+ * @result "200px"
+ *
+ * @example $(document).height();
+ * @result 800
+ *
+ * @example $(window).height();
+ * @result 400
  * 
  * @name height
- * @type jQuery
+ * @type Object
  * @cat Dimensions
  */
-$.fn.height = function() {
-
-	if(this.get(0) == window) {
-		if (self.innerHeight) return self.innerHeight;	
-		else if (document.documentElement && document.documentElement.clientHeight) return document.documentElement.clientHeight;
-		else if (document.body) return document.body.clientHeight;
-	}
+jQuery.fn.height = function() {
+	if ( this.get(0) == window )
+		return self.innerHeight ||
+			jQuery.boxModel && document.documentElement.clientHeight ||
+			document.body.clientHeight;
 	
-	if(this.get(0) == document) {
-
-		var test1 = document.body.scrollHeight;
-		var test2 = document.body.offsetHeight;
-		if (test1 > test2) return document.body.scrollHeight;
-		else return document.body.offsetHeight;		
-	}
+	if ( this.get(0) == document )
+		return Math.max( document.body.scrollHeight, document.body.offsetHeight );
 	
-	return this.css("height");
-}
+	return this.css("height", arguments[0]);
+};
+
 /**
  * Returns the css width value for the first matched element.
  * If used on document, returns the document's width (innerWidth)
- * If used on window, returns the viewports (window's) width
+ * If used on window, returns the viewport's (window) width
  *
  * @example $("#testdiv").width()
- * @result [ 200px ]
+ * @result "200px"
+ *
+ * @example $(document).width();
+ * @result 800
+ *
+ * @example $(window).width();
+ * @result 400
  * 
  * @name width
- * @type jQuery
+ * @type Object
  * @cat Dimensions
  */
-$.fn.width = function() {
-
-	if(this.get(0) == window) {
-		if (self.innerWidth) return self.innerWidth;	
-		else if (document.documentElement && document.documentElement.clientWidth) return document.documentElement.clientWidth;
-		else if (document.body) return document.body.clientWidth;
-	}
+jQuery.fn.width = function() {
+	if ( this.get(0) == window )
+		return self.innerWidth ||
+			jQuery.boxModel && document.documentElement.clientWidth ||
+			document.body.clientWidth;
 	
-	if(this.get(0) == document) {
-
-		var test1 = document.body.scrollWidth;
-		var test2 = document.body.offsetWidth;
-		if (test1 > test2) return document.body.scrollWidth;
-		else return document.body.offsetWidth;		
-	}
+	if ( this.get(0) == document )
+		return Math.max( document.body.scrollWidth, document.body.offsetWidth );
 	
-	return this.css("width");
-}
+	return this.css("width", arguments[0]);
+};
+
 /**
  * Returns the inner height value (without border) for the first matched element.
  * If used on document, returns the document's height (innerHeight)
- * If used on window, returns the viewports (window's) height
+ * If used on window, returns the viewport's (window) height
  *
  * @example $("#testdiv").innerHeight()
- * @result [ 800px ]
+ * @result 800
  * 
  * @name innerHeight
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.innerHeight = function() {
-	if(this.get(0) == window || this.get(0) == document) return this.height();
-	return this.get(0).offsetHeight - (parseInt(this.css("borderTop")) + parseInt(this.css("borderBottom")));
-}
+jQuery.fn.innerHeight = function() {
+	return this.get(0) == window || this.get(0) == document ?
+		this.height() :
+		this.get(0).offsetHeight - parseInt(this.css("borderTop") || 0) - parseInt(this.css("borderBottom") || 0);
+};
+
 /**
  * Returns the inner width value (without border) for the first matched element.
  * If used on document, returns the document's Width (innerWidth)
- * If used on window, returns the viewports (window's) width
+ * If used on window, returns the viewport's (window) width
  *
  * @example $("#testdiv").innerWidth()
- * @result [ 1000px ]
+ * @result 1000
  * 
  * @name innerWidth
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.innerWidth = function() {
-	if(this.get(0) == window || this.get(0) == document) return this.width();
-	return this.get(0).offsetWidth - (parseInt(this.css("borderLeft")) + parseInt(this.css("borderRight")));
-}
+jQuery.fn.innerWidth = function() {
+	return this.get(0) == window || this.get(0) == document ?
+		this.width() :
+		this.get(0).offsetWidth - parseInt(this.css("borderLeft") || 0) - parseInt(this.css("borderRight") || 0);
+};
+
 /**
  * Returns the outer height value (including border) for the first matched element.
  * Cannot be used on document or window.
  *
  * @example $("#testdiv").outerHeight()
- * @result [ 1000px ]
+ * @result 1000
  * 
  * @name outerHeight
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.outerHeight = function() {
-	if(this.get(0) == window || this.get(0) == document) return 0;
-	return this.get(0).offsetHeight;	
-}
+jQuery.fn.outerHeight = function() {
+	return this.get(0) == window || this.get(0) == document ?
+		this.height() :
+		this.get(0).offsetHeight;	
+};
+
 /**
  * Returns the outer width value (including border) for the first matched element.
  * Cannot be used on document or window.
  *
  * @example $("#testdiv").outerWidth()
- * @result [ 1000px ]
+ * @result 1000
  * 
  * @name outerWidth
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.outerWidth = function() {
-	if(this.get(0) == window || this.get(0) == document) return 0;
-	return this.get(0).offsetWidth;	
-}
+jQuery.fn.outerWidth = function() {
+	return this.get(0) == window || this.get(0) == document ?
+		this.width() :
+		this.get(0).offsetWidth;	
+};
+
 /**
  * Returns how many pixels the user has scrolled to the right (scrollLeft).
  * Works on containers with overflow: auto and window/document.
  *
  * @example $("#testdiv").scrollLeft()
- * @result [ 100px ]
+ * @result 100
  * 
  * @name scrollLeft
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.scrollLeft = function() {
-	if(this.get(0) == window || this.get(0) == document) {
-	if (self.pageXOffset) return self.pageXOffset;
-	else if (document.documentElement && document.documentElement.scrollLeft) return document.documentElement.scrollLeft;
-	else if (document.body) return document.body.scrollLeft;
-	}
+jQuery.fn.scrollLeft = function() {
+	if ( this.get(0) == window || this.get(0) == document )
+		return self.pageXOffset ||
+			jQuery.boxModel && document.documentElement.scrollLeft ||
+			document.body.scrollLeft;
+	
 	return this.get(0).scrollLeft;
-}
+};
+
 /**
  * Returns how many pixels the user has scrolled to the bottom (scrollTop).
  * Works on containers with overflow: auto and window/document.
  *
  * @example $("#testdiv").scrollTop()
- * @result [ 100px ]
+ * @result 100
  * 
  * @name scrollTop
- * @type jQuery
+ * @type Number
  * @cat Dimensions
  */
-$.fn.scrollTop = function() {
-	if(this.get(0) == window || this.get(0) == document) {
-	if (self.pageYOffset) return self.pageYOffset;
-	else if (document.documentElement && document.documentElement.scrollTop) return document.documentElement.scrollTop;
-	else if (document.body) return document.body.scrollTop;
-	}	
+jQuery.fn.scrollTop = function() {
+	if ( this.get(0) == window || this.get(0) == document )
+		return self.pageYOffset ||
+			jQuery.boxModel && document.documentElement.scrollTop ||
+			document.body.scrollTop;
+
 	return this.get(0).scrollTop;
-}
\ No newline at end of file
+};
+
+/**
+ * This returns an object with top, left, width, height, borderLeft,
+ * borderTop, marginLeft, marginTop, scrollLeft, scrollTop, 
+ * pageXOffset, pageYOffset.
+ *
+ * The top and left values include the scroll offsets but the
+ * scrollLeft and scrollTop properties of the returned object
+ * are the combined scroll offets of the parent elements 
+ * (not including the window scroll offsets). This is not the
+ * same as the element's scrollTop and scrollLeft.
+ * 
+ * For accurate readings make sure to use pixel values.
+ *
+ * @name offset	
+ * @type Object
+ * @cat Dimensions
+ * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
+ */
+/**
+ * This returns an object with top, left, width, height, borderLeft,
+ * borderTop, marginLeft, marginTop, scrollLeft, scrollTop, 
+ * pageXOffset, pageYOffset.
+ *
+ * The top and left values include the scroll offsets but the
+ * scrollLeft and scrollTop properties of the returned object
+ * are the combined scroll offets of the parent elements 
+ * (not including the window scroll offsets). This is not the
+ * same as the element's scrollTop and scrollLeft.
+ * 
+ * For accurate readings make sure to use pixel values.
+ *
+ * @name offset	
+ * @type Object
+ * @param String refElement This is an expression. The offset returned will be relative to the first matched element.
+ * @cat Dimensions
+ * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
+ */
+/**
+ * This returns an object with top, left, width, height, borderLeft,
+ * borderTop, marginLeft, marginTop, scrollLeft, scrollTop, 
+ * pageXOffset, pageYOffset.
+ *
+ * The top and left values include the scroll offsets but the
+ * scrollLeft and scrollTop properties of the returned object
+ * are the combined scroll offets of the parent elements 
+ * (not including the window scroll offsets). This is not the
+ * same as the element's scrollTop and scrollLeft.
+ * 
+ * For accurate readings make sure to use pixel values.
+ *
+ * @name offset	
+ * @type Object
+ * @param jQuery refElement The offset returned will be relative to the first matched element.
+ * @cat Dimensions
+ * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
+ */
+/**
+ * This returns an object with top, left, width, height, borderLeft,
+ * borderTop, marginLeft, marginTop, scrollLeft, scrollTop, 
+ * pageXOffset, pageYOffset.
+ *
+ * The top and left values include the scroll offsets but the
+ * scrollLeft and scrollTop properties of the returned object
+ * are the combined scroll offets of the parent elements 
+ * (not including the window scroll offsets). This is not the
+ * same as the element's scrollTop and scrollLeft.
+ * 
+ * For accurate readings make sure to use pixel values.
+ *
+ * @name offset	
+ * @type Object
+ * @param HTMLElement refElement The offset returned will be relative to this element.
+ * @cat Dimensions
+ * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
+ */
+jQuery.fn.offset = function(refElem) {
+	if (!this[0]) throw 'jQuery.fn.offset requires an element.';
+
+	refElem = (refElem) ? jQuery(refElem)[0] : null;
+	var x = 0, y = 0, elem = this[0], parent = this[0], sl = 0, st = 0;
+	do {
+		if (parent.tagName == 'BODY' || parent.tagName == 'HTML') {
+			// Safari and IE don't add margin for static and relative
+			if ((jQuery.browser.safari || jQuery.browser.msie) && jQuery.css(parent, 'position') != 'absolute') {
+				x += parseInt(jQuery.css(parent, 'marginLeft')) || 0;
+				y += parseInt(jQuery.css(parent, 'marginTop'))  || 0;
+			}
+			break;
+		}
+
+		x += parent.offsetLeft || 0;
+		y += parent.offsetTop  || 0;
+
+		// Mozilla and IE do not add the border
+		if (jQuery.browser.mozilla || jQuery.browser.msie) {
+			x += parseInt(jQuery.css(parent, 'borderLeftWidth')) || 0;
+			y += parseInt(jQuery.css(parent, 'borderTopWidth'))  || 0;
+		}
+
+		// Need to get scroll offsets in-between offsetParents
+		var op = parent.offsetParent;
+		do {
+			sl += parent.scrollLeft || 0;
+			st += parent.scrollTop  || 0;
+			parent = parent.parentNode;
+		} while (parent != op);
+	} while (parent);
+
+	if (refElem) { // Get the relative offset
+		var offset = jQuery(refElem).offset();
+		x  = x  - offset.left;
+		y  = y  - offset.top;
+		sl = sl - offset.scrollLeft;
+		st = st - offset.scrollTop;
+	}
+
+	// Safari and Opera do not add the border for the element
+	if (jQuery.browser.safari || jQuery.browser.opera) {
+		x += parseInt(jQuery.css(elem, 'borderLeftWidth')) || 0;
+		y += parseInt(jQuery.css(elem, 'borderTopWidth'))  || 0;
+	}
+
+	return {
+		top:  y - st,
+		left: x - sl,
+		width:  elem.offsetWidth,
+		height: elem.offsetHeight,
+		borderTop:  parseInt(jQuery.css(elem, 'borderTopWidth'))  || 0,
+		borderLeft: parseInt(jQuery.css(elem, 'borderLeftWidth')) || 0,
+		marginTop:  parseInt(jQuery.css(elem, 'marginTopWidth'))  || 0,
+		marginLeft: parseInt(jQuery.css(elem, 'marginLeftWidth')) || 0,
+		scrollTop:  st,
+		scrollLeft: sl,
+		pageYOffset: window.pageYOffset || document.documentElement.scrollTop  || document.body.scrollTop  || 0,
+		pageXOffset: window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft || 0
+	};
+};
\ No newline at end of file