Landing a version of $(document)/$(window) .width()/.height(). It won't win any award...
[jquery.git] / src / core.js
index ac45d62..3fb59f8 100644 (file)
@@ -292,31 +292,60 @@ jQuery.fn = jQuery.prototype = {
        
        val: function( val ) {
                if ( val == undefined ) {
-                   if ( this.length ) {
-                       var elem = this[0];
+                       if ( this.length ) {
+                               var elem = this[0];
                        
-                       // We need to handle select boxes special\r                              if ( jQuery.nodeName(elem, "select") ) {\r                                       var index = elem.selectedIndex,
+                               // We need to handle select boxes special
+                               if ( jQuery.nodeName(elem, "select") ) {
+                                       var index = elem.selectedIndex,
                                                a = [],
                                                options = elem.options,
                                                one = elem.type == "select-one";
                                        
-                                       // Nothing was selected\r                                        if ( index < 0 )
-                                               return null;\r
-
-                                       // Loop through all the selected options\r                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-                                               var option = options[i];\r                                               if ( option.selected ) {\r                                                       // Get the specifc value for the option\r                                                        var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
+                                       // Nothing was selected
+                                       if ( index < 0 )
+                                               return null;
+
+                                       // Loop through all the selected options
+                                       for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+                                               var option = options[i];
+                                               if ( option.selected ) {
+                                                       // Get the specifc value for the option
+                                                       var val = jQuery.browser.msie && !option.attributes["value"].specified ? option.text : option.value;
                                                        
-                                                       // We don't need an array for one selects\r                                                      if ( one )
+                                                       // We don't need an array for one selects
+                                                       if ( one )
                                                                return val;
                                                        
-                                                       // Multi-Selects return an array\r                                                       a.push(val);\r                                           }\r                                      }
-                                       \r                                       return a;
+                                                       // Multi-Selects return an array
+                                                       a.push(val);
+                                               }
+                                       }
                                        
-                               // Everything else, we just grab the value\r                             } else
+                                       return a;
+                                       
+                               // Everything else, we just grab the value
+                               } else
                                        return this[0].value.replace(/\r/g, "");
                        }
                } else
-                       return this.attr( "value", val );
+                       return this.each(function(){
+                               if ( val.constructor == Array && /radio|checkbox/.test(this.type) )
+                                       this.checked = (jQuery.inArray(this.value, val) >= 0 ||
+                                               jQuery.inArray(this.name, val) >= 0);
+                               else if ( jQuery.nodeName(this, "select") ) {
+                                       var tmp = val.constructor == Array ? val : [val];
+
+                                       jQuery("option", this).each(function(){
+                                               this.selected = (jQuery.inArray(this.value, tmp) >= 0 ||
+                                               jQuery.inArray(this.text, tmp) >= 0);
+                                       });
+
+                                       if ( !tmp.length )
+                                               this.selectedIndex = -1;
+                               } else
+                                       this.value = val;
+                       });
        },
        
        html: function( val ) {
@@ -985,9 +1014,11 @@ jQuery.extend({
 
 jQuery.each({
        parent: "a.parentNode",
-       parents: "jQuery.parents(a)",
+       parents: "jQuery.dir(a,'parentNode')",
        next: "jQuery.nth(a,2,'nextSibling')",
        prev: "jQuery.nth(a,2,'previousSibling')",
+       nextAll: "jQuery.dir(a,'nextSibling')",
+       prevtAll: "jQuery.dir(a,'previousSibling')",
        siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
        children: "jQuery.sibling(a.firstChild)",
        contents: "jQuery.nodeName(a,'iframe')?a.contentDocument||a.contentWindow.document:jQuery.makeArray(a.childNodes)"
@@ -1049,10 +1080,20 @@ jQuery.each( {
        };
 });
 
-jQuery.each( [ "height", "width" ], function(i,n){
+jQuery.each( [ "Height", "Width" ], function(i,name){
+       var n = name.toLowerCase();
+       
        jQuery.fn[ n ] = function(h) {
-               return h == undefined ?
-                       ( this.length ? jQuery.css( this[0], n ) : null ) :
-                       this.css( n, h.constructor == String ? h : h + "px" );
+               return this[0] == window ?
+                       jQuery.browser.safari && self["inner" + name] ||
+                       jQuery.boxModel && Math.max(document.documentElement["client" + name], document.body["client" + name]) ||
+                       document.body["client" + name] :
+               
+                       this[0] == document ?
+                               Math.max( document.body["scroll" + name], document.body["offset" + name] ) :
+        
+                               h == undefined ?
+                                       ( this.length ? jQuery.css( this[0], n ) : null ) :
+                                       this.css( n, h.constructor == String ? h : h + "px" );
        };
 });