X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=40598076dff94fd44692e6e60a70c306cb78d59f;hb=41cc839a2dff6342aaba048eae36d66d2a25d288;hp=c6f2a9b8ecaa90f8ef2387cf5197508e94c48bfb;hpb=12e63353391f1a556a73fe92bcd8e5f0ac277726;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index c6f2a9b..4059807 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -430,30 +430,26 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Attributes
*/
attr: function( key, value, type ) {
+ var obj = key;
+
+ // Look for the case where we're accessing a style value
+ if ( key.constructor == String )
+ if ( value == undefined )
+ return jQuery[ type || "attr" ]( this[0], key );
+ else {
+ obj = {};
+ obj[ key ] = value;
+ }
+
// Check to see if we're setting style values
- return typeof key != "string" || value != undefined ?
- this.each(function(){
- // See if we're setting a hash of styles
- if ( value == undefined )
- // Set all the styles
- for ( var prop in key )
- jQuery.attr(
- type ? this.style : this,
- prop, jQuery.parseSetter(key[prop])
- );
-
- // See if we're setting a single key/value style
- else {
- // convert ${this.property} to function returnung that property
- jQuery.attr(
- type ? this.style : this,
- key, jQuery.parseSetter(value)
- );
- }
- }) :
-
- // Look for the case where we're accessing a style value
- jQuery[ type || "attr" ]( this[0], key );
+ return this.each(function(){
+ // Set all the styles
+ for ( var prop in obj )
+ jQuery.attr(
+ type ? this.style : this,
+ prop, jQuery.prop(this, prop, obj[prop], type)
+ );
+ });
},
/**
@@ -530,10 +526,8 @@ jQuery.fn = jQuery.prototype = {
/**
* Set the text contents of all matched elements.
*
- * Similar to html(), but escapes HTML (replace "<" and ">" with their
- * HTML entities.
- *
- * If stripTags argument is set to true, HTML is stripped.
+ * Similar to html(), but escapes HTML (replace "<" and ">" with their
+ * HTML entities).
*
* @example $("p").text("Some new text.");
* @before
Test Paragraph.
@@ -548,23 +542,15 @@ jQuery.fn = jQuery.prototype = {
* @name text
* @type String
* @param String val The text value to set the contents of the element to.
- * @param Boolean stripTags (optional) Wheather to strip or only escape tags
* @cat DOM/Attributes
*/
- text: function(e, stripTags) {
- if ( typeof e == "string" )
- return this.html( stripTags ? e.replace(/<\/?[^>]+>/gi, '') : e.replace(//g, ">") );
-
- e = e || this;
- var t = "";
- for ( var j = 0, el = e.length; j < el; j++ ) {
- var r = e[j].childNodes;
- for ( var i = 0, rl = r.length; i < rl; i++ )
- if ( r[i].nodeType != 8 )
- t += r[i].nodeType != 1 ?
- r[i].nodeValue : jQuery.fn.text([ r[i] ]);
- }
- return t;
+ text: function(e) {
+ var type = this.length && this[0].innerText == undefined ?
+ "textContent" : "innerText";
+
+ return e == undefined ?
+ this.length && this[0][ type ] :
+ this.each(function(){ this[ type ] = e; });
},
/**
@@ -1053,7 +1039,7 @@ jQuery.fn = jQuery.prototype = {
* @cat DOM/Attributes
*/
html: function( val ) {
- return val == undefined ?
( this.length ? this[0].innerHTML : null ) :
this.attr( "innerHTML", val );
+ return val == undefined ?
( this.length ? this[0].innerHTML : null ) :
this.empty().append( val );
},
/**
@@ -1233,22 +1219,32 @@ jQuery.extend({
if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
return obj;
},
+
+ prop: function(elem, key, value){
+ // Handle executable functions
+ return value.constructor == Function &&
+ value.call( elem ) || value;
+ },
className: {
+ // internal only, use addClass("class")
add: function( elem, c ){
jQuery.each( c.split(/\s+/), function(i, cur){
if ( !jQuery.className.has( elem.className, cur ) )
elem.className += ( elem.className ? " " : "" ) + cur;
});
},
+ // internal only, use removeClass("class")
remove: function( elem, c ){
elem.className = c ?
jQuery.grep( elem.className.split(/\s+/), function(cur){
return !jQuery.className.has( c, cur );
}).join(' ') : "";
},
- has: function( classes, c ){
- return classes && new RegExp("(^|\\s)" + c + "(\\s|$)").test( classes );
+ // internal only, use is(".class")
+ has: function( t, c ) {
+ t = t.className || t;
+ return t && new RegExp("(^|\\s)" + c + "(\\s|$)").test( t );
}
},
@@ -1315,11 +1311,10 @@ jQuery.extend({
if (prop == "float" || prop == "cssFloat")
prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
- if (!force && elem.style[prop]) {
-
+ if (!force && elem.style[prop])
ret = elem.style[prop];
- } else if (document.defaultView && document.defaultView.getComputedStyle) {
+ else if (document.defaultView && document.defaultView.getComputedStyle) {
if (prop == "cssFloat" || prop == "styleFloat")
prop = "float";
@@ -1349,66 +1344,67 @@ jQuery.extend({
clean: function(a) {
var r = [];
+
for ( var i = 0, al = a.length; i < al; i++ ) {
var arg = a[i];
- if ( typeof arg == "string" ) { // Convert html string into DOM nodes
+
+ // Convert html string into DOM nodes
+ if ( typeof arg == "string" ) {
// Trim whitespace, otherwise indexOf won't work as expected
- var s = jQuery.trim(arg), s3 = s.substring(0,3), s6 = s.substring(0,6),
- div = document.createElement("div"), wrap = [0,"",""];
-
- if ( s.substring(0,4) == "", ""];
- else if ( s6 == "", ""];
- else if ( s3 == "
", ""];
- else if ( s3 == " matched above
- wrap = [3, ""];
+ var s = jQuery.trim(arg), div = document.createElement("div"), tb = [];
+
+ var wrap =
+ // option or optgroup
+ !s.indexOf("", ""] ||
+
+ !s.indexOf("", ""] ||
+
+ !s.indexOf(" ", ""] ||
+
+ // matched above
+ !s.indexOf(" | ", " "] ||
+
+ [0,"",""];
// Go to html and back, then peel off extra wrappers
div.innerHTML = wrap[1] + s + wrap[2];
- while ( wrap[0]-- ) div = div.firstChild;
+
+ // Move to the right depth
+ while ( wrap[0]-- )
+ div = div.firstChild;
// Remove IE's autoinserted from table fragments
if ( jQuery.browser.msie ) {
- var tb = null;
+
// String was a , *may* have spurious
- if ( s6 == " or
else if ( wrap[1] == "" && s.indexOf("= 0 ; --n )
- if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
- tb[n].parentNode.removeChild(tb[n]);
- }
+
+ for ( var n = tb.length-1; n >= 0 ; --n )
+ if ( tb[n].nodeName.toUpperCase() == "TBODY" && !tb[n].childNodes.length )
+ tb[n].parentNode.removeChild(tb[n]);
+
}
arg = div.childNodes;
- }
-
+ }
- if ( arg.length != undefined && ( (jQuery.browser.safari && typeof arg == 'function') || !arg.nodeType ) ) // Safari reports typeof on a DOM NodeList to be a function
- for ( var n = 0, argl = arg.length; n < argl; n++ ) // Handles Array, jQuery, DOM NodeList collections
- r.push(arg[n]);
+ if ( arg.nodeType )
+ r.push( arg );
else
- r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) );
+ r = jQuery.merge( r, arg );
}
return r;
},
- parseSetter: function(value) {
- if( typeof value == "string" && value.charAt(0) == "$" ) {
- var m = value.match(/{(.*)}$/);
- if ( m && m[1] ) {
- value = new Function( "return " + m[1] );
- }
- }
- return value;
- },
-
attr: function(elem, name, value){
var fix = {
"for": "htmlFor",
@@ -1424,11 +1420,6 @@ jQuery.extend({
selected: "selected"
};
- // get value if a function is provided
- if ( value && typeof value == "function" ) {
- value = value.apply( elem );
- }
-
// IE actually uses filters for opacity ... elem is actually elem.style
if ( name == "opacity" && jQuery.browser.msie && value != undefined ) {
// IE has trouble with opacity if it does not have layout
@@ -1439,10 +1430,9 @@ jQuery.extend({
return elem.filter = elem.filter.replace(/alpha\([^\)]*\)/gi,"") +
( value == 1 ? "" : "alpha(opacity=" + value * 100 + ")" );
- } else if ( name == "opacity" && jQuery.browser.msie ) {
+ } else if ( name == "opacity" && jQuery.browser.msie )
return elem.filter ?
parseFloat( elem.filter.match(/alpha\(opacity=(.*)\)/)[1] ) / 100 : 1;
- }
// Mozilla doesn't play well with opacity 1
if ( name == "opacity" && jQuery.browser.mozilla && value == 1 )
@@ -1453,11 +1443,11 @@ jQuery.extend({
if ( value != undefined ) elem[fix[name]] = value;
return elem[fix[name]];
- } else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
+ } else if ( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') )
return elem.getAttributeNode(name).nodeValue;
// IE elem.getAttribute passes even for style
- } else if ( elem.tagName ) {
+ else if ( elem.tagName ) {
if ( value != undefined ) elem.setAttribute( name, value );
return elem.getAttribute( name );
@@ -1486,10 +1476,10 @@ jQuery.extend({
makeArray: function( a ) {
var r = [];
- if ( a.constructor != Array ) {
+ if ( a.constructor != Array )
for ( var i = 0, al = a.length; i < al; i++ )
r.push( a[i] );
- } else
+ else
r = a.slice( 0 );
return r;
@@ -1527,12 +1517,11 @@ jQuery.extend({
// Now check for duplicates between the two arrays
// and only add the unique items
- for ( var i = 0, sl = second.length; i < sl; i++ ) {
+ for ( var i = 0, sl = second.length; i < sl; i++ )
// Check for duplicates
if ( jQuery.inArray( second[i], r ) == -1 )
// The item is unique, add it
first.push( second[i] );
- }
return first;
},
@@ -1828,9 +1817,9 @@ new function() {
*/
jQuery.each({
parent: "a.parentNode",
- parents: jQuery.parents,
- next: "jQuery.nth(a,1,'nextSibling')",
- prev: "jQuery.nth(a,1,'previousSibling')",
+ parents: "jQuery.parents(a)",
+ next: "jQuery.nth(a,2,'nextSibling')",
+ prev: "jQuery.nth(a,2,'previousSibling')",
siblings: "jQuery.sibling(a.parentNode.firstChild,a)",
children: "jQuery.sibling(a.firstChild)"
}, function(i,n){
@@ -1939,50 +1928,6 @@ jQuery.each({
*/
/**
- * Displays each of the set of matched elements if they are hidden.
- *
- * @example $("p").show()
- * @before Hello
- * @result [ Hello ]
- *
- * @name show
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Hides each of the set of matched elements if they are shown.
- *
- * @example $("p").hide()
- * @before Hello
- * @result [ Hello ]
- *
- * var pass = true, div = $("div");
- * div.hide().each(function(){
- * if ( this.style.display != "none" ) pass = false;
- * });
- * ok( pass, "Hide" );
- *
- * @name hide
- * @type jQuery
- * @cat Effects
- */
-
-/**
- * Toggles each of the set of matched elements. If they are shown,
- * toggle makes them hidden. If they are hidden, toggle
- * makes them shown.
- *
- * @example $("p").toggle()
- * @before Hello Hello Again
- * @result [ Hello , Hello Again ]
- *
- * @name toggle
- * @type jQuery
- * @cat Effects
- */
-
-/**
* Adds the specified class to each of the set of matched elements.
*
* @example $("p").addClass("selected")
@@ -2065,20 +2010,6 @@ jQuery.each( {
jQuery.attr( this, key, "" );
this.removeAttribute( key );
},
- show: function(){
- this.style.display = this.oldblock ? this.oldblock : "";
- if ( jQuery.css(this,"display") == "none" )
- this.style.display = "block";
- },
- hide: function(){
- this.oldblock = this.oldblock || jQuery.css(this,"display");
- if ( this.oldblock == "none" )
- this.oldblock = "block";
- this.style.display = "none";
- },
- toggle: function(){
- jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ].apply( jQuery(this), arguments );
- },
addClass: function(c){
jQuery.className.add(this,c);
},
|