X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fdimensions%2Fdimensions.js;fp=src%2Fdimensions%2Fdimensions.js;h=6a7d20a77e012d4b074d24afa9670daeb043a256;hb=c26ae24a1be9fda111f2c3fc69a3e865bfc1ec31;hp=ce87862bdd02487990fd491b6a454b64c2321403;hpb=7b2c84ddbe004ed4ab2ee3982af40b7275d7dfde;p=jquery.git

diff --git a/src/dimensions/dimensions.js b/src/dimensions/dimensions.js
index ce87862..6a7d20a 100644
--- a/src/dimensions/dimensions.js
+++ b/src/dimensions/dimensions.js
@@ -9,21 +9,21 @@
  * If used on window, returns the viewport's (window) height
  *
  * @example $("#testdiv").height()
- * @result "200px"
- *
- * @example $(document).height();
- * @result 800
- *
- * @example $(window).height();
+ * @result "200px"
+ *
+ * @example $(document).height();
+ * @result 800
+ *
+ * @example $(window).height();
  * @result 400
  * 
  * @name height
  * @type Object
  * @cat Dimensions
  */
-$.fn.height = function() {
-	if ( this.get(0) == window )
-		return self.innerHeight ||
+jQuery.fn.height = function() {
+	if ( this.get(0) == window )
+		return self.innerHeight ||
 			jQuery.boxModel && document.documentElement.clientHeight ||
 			document.body.clientHeight;
 	
@@ -31,7 +31,7 @@ $.fn.height = function() {
 		return Math.max( document.body.scrollHeight, document.body.offsetHeight );
 	
 	return this.css("height");
-};
+};
 
 /**
  * Returns the css width value for the first matched element.
@@ -39,21 +39,21 @@ $.fn.height = function() {
  * If used on window, returns the viewport's (window) width
  *
  * @example $("#testdiv").width()
- * @result "200px"
- *
- * @example $(document).width();
- * @result 800
- *
- * @example $(window).width();
+ * @result "200px"
+ *
+ * @example $(document).width();
+ * @result 800
+ *
+ * @example $(window).width();
  * @result 400
  * 
  * @name width
  * @type Object
  * @cat Dimensions
  */
-$.fn.width = function() {
-	if ( this.get(0) == window )
-		return self.innerWidth ||
+jQuery.fn.width = function() {
+	if ( this.get(0) == window )
+		return self.innerWidth ||
 			jQuery.boxModel && document.documentElement.clientWidth ||
 			document.body.clientWidth;
 	
@@ -61,7 +61,7 @@ $.fn.width = function() {
 		return Math.max( document.body.scrollWidth, document.body.offsetWidth );
 	
 	return this.css("width");
-};
+};
 
 /**
  * Returns the inner height value (without border) for the first matched element.
@@ -75,11 +75,11 @@ $.fn.width = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.innerHeight = function() {
-	return this.get(0) == window || this.get(0) == document ?
-		this.height() :
+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.
@@ -93,11 +93,11 @@ $.fn.innerHeight = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.innerWidth = function() {
-	return this.get(0) == window || this.get(0) == document ?
-		this.width() :
+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.
@@ -110,11 +110,11 @@ $.fn.innerWidth = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.outerHeight = function() {
-	return this.get(0) == window || this.get(0) == document ?
-		this.height() :
+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.
@@ -127,11 +127,11 @@ $.fn.outerHeight = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.outerWidth = function() {
-	return this.get(0) == window || this.get(0) == document ?
-		this.width() :
+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).
@@ -144,14 +144,14 @@ $.fn.outerWidth = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.scrollLeft = function() {
-	if ( this.get(0) == window || this.get(0) == document )
-		return self.pageXOffset ||
-			jQuery.boxModel && document.documentElement.scrollLeft ||
-			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).
@@ -164,20 +164,15 @@ $.fn.scrollLeft = function() {
  * @type Number
  * @cat Dimensions
  */
-$.fn.scrollTop = function() {
-	if ( this.get(0) == window || this.get(0) == document )
-		return self.pageYOffset ||
-			jQuery.boxModel && document.documentElement.scrollTop ||
-			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;
 };
 
-/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- */
-
 /**
  * This returns an object with top, left, width, height, borderLeft,
  * borderTop, marginLeft, marginTop, scrollLeft, scrollTop, 
@@ -253,24 +248,24 @@ $.fn.scrollTop = function() {
  * @cat Dimensions
  * @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
  */
-$.fn.offset = function(refElem) {
-	if (!this[0]) throw '$.fn.offset requires an element.';
+jQuery.fn.offset = function(refElem) {
+	if (!this[0]) throw 'jQuery.fn.offset requires an element.';
 	
-	refElem = (refElem) ? $(refElem)[0] : null;
+	refElem = (refElem) ? jQuery(refElem)[0] : null;
 	var x = 0, y = 0, elm = this[0], parent = this[0], pos = null, borders = [0,0], isElm = true, sl = 0, st = 0;
 	do {
 		if (parent.tagName == 'BODY' || parent.tagName == 'HTML') {
 			// Safari and IE don't add margin for static and relative
-			if (($.browser.safari || $.browser.msie) && pos != 'absolute') {
-				x += parseInt($.css(parent, 'marginLeft')) || 0;
-				y += parseInt($.css(parent, 'marginTop'))  || 0;
+			if ((jQuery.browser.safari || jQuery.browser.msie) && pos != 'absolute') {
+				x += parseInt(jQuery.css(parent, 'marginLeft')) || 0;
+				y += parseInt(jQuery.css(parent, 'marginTop'))  || 0;
 			}
 			break;
 		}
 		
-		pos    = $.css(parent, 'position');
-		border = [parseInt($.css(parent, 'borderLeftWidth')) || 0,
-							parseInt($.css(parent, 'borderTopWidth'))  || 0];
+		pos    = jQuery.css(parent, 'position');
+		border = [parseInt(jQuery.css(parent, 'borderLeftWidth')) || 0,
+							parseInt(jQuery.css(parent, 'borderTopWidth'))  || 0];
 		sl = parent.scrollLeft;
 		st = parent.scrollTop;
 		
@@ -278,7 +273,7 @@ $.fn.offset = function(refElem) {
 		y += (parent.offsetTop  || 0) + border[1] - st;
 		
 		// Safari and Opera include the border already for parents with position = absolute|relative
-		if (($.browser.safari || $.browser.opera) && !isElm && (pos == 'absolute' || pos == 'relative')) {
+		if ((jQuery.browser.safari || jQuery.browser.opera) && !isElm && (pos == 'absolute' || pos == 'relative')) {
 			x -= border[0];
 			y -= border[1];
 		}
@@ -288,7 +283,7 @@ $.fn.offset = function(refElem) {
 	} while(parent);
 	
 	if (refElem) {
-		var offset = $(refElem).offset();
+		var offset = jQuery(refElem).offset();
 		x  = x  - offset.left;
 		y  = y  - offset.top;
 		sl = sl - offset.scrollLeft;
@@ -300,10 +295,10 @@ $.fn.offset = function(refElem) {
 		left: x,
 		width:  elm.offsetWidth,
 		height: elm.offsetHeight,
-		borderTop:  parseInt($.css(elm, 'borderTopWidth'))  || 0,
-		borderLeft: parseInt($.css(elm, 'borderLeftWidth')) || 0,
-		marginTop:  parseInt($.css(elm, 'marginTopWidth'))  || 0,
-		marginLeft: parseInt($.css(elm, 'marginLeftWidth')) || 0,
+		borderTop:  parseInt(jQuery.css(elm, 'borderTopWidth'))  || 0,
+		borderLeft: parseInt(jQuery.css(elm, 'borderLeftWidth')) || 0,
+		marginTop:  parseInt(jQuery.css(elm, 'marginTopWidth'))  || 0,
+		marginLeft: parseInt(jQuery.css(elm, 'marginLeftWidth')) || 0,
 		scrollTop:  st,
 		scrollLeft: sl,
 		pageYOffset: window.pageYOffset || document.documentElement.scrollTop  || document.body.scrollTop  || 0,