/*
* jQuery @VERSION - New Wave Javascript
*
- * Copyright (c) 2007 John Resig (jquery.com)
+ * Copyright (c) 2008 John Resig (jquery.com)
* Dual licensed under the MIT (MIT-LICENSE.txt)
* and GPL (GPL-LICENSE.txt) licenses.
*
// as properties will not be copied (such as the
// the name attribute on an input).
var clone = this.cloneNode(true),
- container = document.createElement("div"),
- container2 = document.createElement("div");
+ container = document.createElement("div");
container.appendChild(clone);
- container2.innerHTML = container.innerHTML;
- return container2.firstChild;
+ return jQuery.clean([container.innerHTML])[0];
} else
return this.cloneNode(true);
});
andSelf: function() {
return this.add( this.prevObject );
},
+
+ data: function( key, value ){
+ var parts = key.split(".");
+ parts[1] = parts[1] ? "." + parts[1] : "";
+
+ if ( value == null ) {
+ var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+ if ( data == undefined && this.length )
+ data = jQuery.data( this[0], key );
+
+ return data == null && parts[1] ?
+ this.data( parts[0] ) :
+ data;
+ } else
+ return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+ jQuery.data( this, key, value );
+ });
+ },
+
+ removeData: function( key ){
+ return this.each(function(){
+ jQuery.removeData( this, key );
+ });
+ },
domManip: function( args, table, reverse, callback ) {
var clone = this.length > 1, elems;
// Recurse if we're merging object values
if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType )
- target[ name ] = jQuery.extend( target[ name ], options[ name ] );
+ target[ name ] = jQuery.extend( deep, target[ name ], options[ name ] );
// Don't bring in undefined values
else if ( options[ name ] != undefined )
// exclude the following css properties to add px
var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i;
+// cache getComputedStyle
+var getComputedStyle = document.defaultView && document.defaultView.getComputedStyle;
jQuery.extend({
noConflict: function( deep ) {
return jQuery;
},
- // This may seem like some crazy code, but trust me when I say that this
- // is the only cross-browser way to do this. --John
+ // See test/unit/core.js for details concerning this function.
isFunction: function( fn ) {
return !!fn && typeof fn != "string" && !fn.nodeName &&
fn.constructor != Array && /function/i.test( fn + "" );
// args is for internal usage only
each: function( object, callback, args ) {
if ( args ) {
- if ( object.length == undefined )
+ if ( object.length == undefined ) {
for ( var name in object )
- callback.apply( object[ name ], args );
- else
+ if ( callback.apply( object[ name ], args ) === false )
+ break;
+ } else
for ( var i = 0, length = object.length; i < length; i++ )
if ( callback.apply( object[ i ], args ) === false )
break;
// A special, fast, case for the most common use of each
} else {
- if ( object.length == undefined )
+ if ( object.length == undefined ) {
for ( var name in object )
- callback.call( object[ name ], name, object[ name ] );
- else
+ if ( callback.call( object[ name ], name, object[ name ] ) === false )
+ break;
+ } else
for ( var i = 0, length = object.length, value = object[0];
i < length && callback.call( value, i, value ) !== false; value = object[++i] ){}
}
function color( elem ) {
if ( !jQuery.browser.safari )
return false;
-
- var ret = document.defaultView.getComputedStyle( elem, null );
+
+ // getComputedStyle is cached
+ var ret = getComputedStyle( elem, null );
return !ret || ret.getPropertyValue("color") == "";
}
}
// Opera sometimes will give the wrong display answer, this fixes it, see #2037
if ( jQuery.browser.opera && name == "display" ) {
- var save = elem.style.display;
- elem.style.display = "block";
- elem.style.display = save;
+ var save = elem.style.outline;
+ elem.style.outline = "0 solid black";
+ elem.style.outline = save;
}
// Make sure we're using the right name for getting the float value
if ( name.match( /float/i ) )
name = styleFloat;
- if ( !force && elem.style[ name ] )
+ if ( !force && elem.style && elem.style[ name ] )
ret = elem.style[ name ];
- else if ( document.defaultView && document.defaultView.getComputedStyle ) {
+ else if ( getComputedStyle ) {
// Only "float" is needed here
if ( name.match( /float/i ) )
name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase();
- var getComputedStyle = document.defaultView.getComputedStyle( elem, null );
+ var computedStyle = getComputedStyle( elem, null );
- if ( getComputedStyle && !color( elem ) )
- ret = getComputedStyle.getPropertyValue( name );
+ if ( computedStyle && !color( elem ) )
+ ret = computedStyle.getPropertyValue( name );
// If the element isn't reporting its values properly in Safari
// then some display: none elements are involved
// one special, otherwise get the value
ret = name == "display" && swap[ stack.length - 1 ] != null ?
"none" :
- ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || "";
+ ( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
// Finally, revert the display styles back
for ( var i = 0; i < swap.length; i++ )
if ( typeof elem == "string" ) {
// Fix "XHTML"-style tags in all browsers
elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
- return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area)$/i) ?
+ return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
all :
front + "></" + tag + ">";
});
makeArray: function( array ) {
var ret = [];
- // Need to use typeof to fight Safari childNodes crashes
- if ( typeof array != "array" )
- for ( var i = 0, length = array.length; i < length; i++ )
- ret.push( array[ i ] );
- else
- ret = array.slice( 0 );
+ if( array != undefined )
+ //strings and functions also have 'length'
+ if( array.length != undefined && !array.split && !array.call )
+ for( var i = array.length; i; )
+ ret[--i] = array[i];
+ else
+ ret[0] = array;
return ret;
},
},
grep: function( elems, callback, inv ) {
- // If a string is passed in for the function, make a function
- // for it (a handy shortcut)
- if ( typeof callback == "string" )
- callback = eval("false||function(a,i){return " + callback + "}");
-
var ret = [];
// Go through the array, only saving the items
});
jQuery.each({
- parent: "elem.parentNode",
- parents: "jQuery.dir(elem,'parentNode')",
- next: "jQuery.nth(elem,2,'nextSibling')",
- prev: "jQuery.nth(elem,2,'previousSibling')",
- nextAll: "jQuery.dir(elem,'nextSibling')",
- prevAll: "jQuery.dir(elem,'previousSibling')",
- siblings: "jQuery.sibling(elem.parentNode.firstChild,elem)",
- children: "jQuery.sibling(elem.firstChild)",
- contents: "jQuery.nodeName(elem,'iframe')?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes)"
+ parent: function(elem){return elem.parentNode;},
+ parents: function(elem){return jQuery.dir(elem,"parentNode");},
+ next: function(elem){return jQuery.nth(elem,2,"nextSibling");},
+ prev: function(elem){return jQuery.nth(elem,2,"previousSibling");},
+ nextAll: function(elem){return jQuery.dir(elem,"nextSibling");},
+ prevAll: function(elem){return jQuery.dir(elem,"previousSibling");},
+ siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},
+ children: function(elem){return jQuery.sibling(elem.firstChild);},
+ contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}
}, function(name, fn){
- fn = eval("false||function(elem){return " + fn + "}");
-
jQuery.fn[ name ] = function( selector ) {
var ret = jQuery.map( this, fn );
git.asbjorn.biz / jquery.git / blobdiff