X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcore.js;h=efc654fb409444addbdc760824f90a2c878eb9a4;hb=b0c7df65d0f92b77752e8f9b33898d0e3b2c05e8;hp=2b856c8dda439c1bb424cea5bdfb988acffcfbaf;hpb=9bcd2b370b4aa72cc60af85d0f8a0872d0d17a0a;p=jquery.git diff --git a/src/core.js b/src/core.js index 2b856c8..efc654f 100644 --- a/src/core.js +++ b/src/core.js @@ -1,7 +1,7 @@ /* * 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. * @@ -303,11 +303,9 @@ jQuery.fn = jQuery.prototype = { // 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); }); @@ -479,6 +477,31 @@ jQuery.fn = jQuery.prototype = { 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; @@ -707,20 +730,22 @@ jQuery.extend({ // 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] ){} } @@ -836,7 +861,7 @@ jQuery.extend({ 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 ) { @@ -1153,11 +1178,6 @@ jQuery.extend({ }, 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 @@ -1230,18 +1250,16 @@ jQuery.extend({ }); 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 );