X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=8b28fdbccfcf06a57090e95688600a21edcbfae5;hb=c3d8cb0c09c2d7d5f0fc3a78f8b4cef9b0adc640;hp=b2252077377a0dd239eab12892ba32d7a7738242;hpb=370c6d564a295cf7d5ccdcafc1bb66d07d615014;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index b225207..8b28fdb 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -1398,336 +1398,7 @@ jQuery.extend({ return r; }, - - /** - * A handy, and fast, way to traverse in a particular direction and find - * a specific element. - * - * @private - * @name $.nth - * @type DOMElement - * @param DOMElement cur The element to search from. - * @param Number|String num The Nth result to match. Can be a number or a string (like 'even' or 'odd'). - * @param String dir The direction to move in (pass in something like 'previousSibling' or 'nextSibling'). - * @cat DOM/Traversing - */ - nth: function(cur,result,dir){ - result = result || 1; - var num = 0; - for ( ; cur; cur = cur[dir] ) { - if ( cur.nodeType == 1 ) num++; - if ( num == result || result == "even" && num % 2 == 0 && num > 1 || - result == "odd" && num % 2 == 1 ) return cur; - } - }, - - expr: { - "": "m[2]== '*'||a.nodeName.toUpperCase()==m[2].toUpperCase()", - "#": "a.getAttribute('id')==m[2]", - ":": { - // Position Checks - lt: "im[3]-0", - nth: "m[3]-0==i", - eq: "m[3]-0==i", - first: "i==0", - last: "i==r.length-1", - even: "i%2==0", - odd: "i%2", - - // Child Checks - "nth-child": "jQuery.nth(a.parentNode.firstChild,m[3],'nextSibling')==a", - "first-child": "jQuery.nth(a.parentNode.firstChild,1,'nextSibling')==a", - "last-child": "jQuery.nth(a.parentNode.lastChild,1,'previousSibling')==a", - "only-child": "jQuery.sibling(a.parentNode.firstChild).length==1", - - // Parent Checks - parent: "a.childNodes.length", - empty: "!a.childNodes.length", - - // Text Check - contains: "jQuery.fn.text.apply([a]).indexOf(m[3])>=0", - - // Visibility - visible: "a.type!='hidden'&&jQuery.css(a,'display')!='none'&&jQuery.css(a,'visibility')!='hidden'", - hidden: "a.type=='hidden'||jQuery.css(a,'display')=='none'||jQuery.css(a,'visibility')=='hidden'", - - // Form attributes - enabled: "!a.disabled", - disabled: "a.disabled", - checked: "a.checked", - selected: "a.selected || jQuery.attr(a, 'selected')", - - // Form elements - text: "a.type=='text'", - radio: "a.type=='radio'", - checkbox: "a.type=='checkbox'", - file: "a.type=='file'", - password: "a.type=='password'", - submit: "a.type=='submit'", - image: "a.type=='image'", - reset: "a.type=='reset'", - button: "a.type=='button'||a.nodeName=='BUTTON'", - input: "/input|select|textarea|button/i.test(a.nodeName)" - }, - ".": "jQuery.className.has(a,m[2])", - "@": { - "=": "z==m[4]", - "!=": "z!=m[4]", - "^=": "z && !z.indexOf(m[4])", - "$=": "z && z.substr(z.length - m[4].length,m[4].length)==m[4]", - "*=": "z && z.indexOf(m[4])>=0", - "": "z", - _resort: function(m){ - return ["", m[1], m[3], m[2], m[5]]; - }, - _prefix: "z=jQuery.attr(a,m[3]);" - }, - "[": "jQuery.find(m[2],a).length" - }, - - /** - * All elements on a specified axis. - * - * @private - * @name $.sibling - * @type Array - * @param Element elem The element to find all the siblings of (including itself). - * @cat DOM/Traversing - */ - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType == 1 && (!elem || n != elem) ) - r.push( n ); - } - - return r; - }, - - token: [ - "\\.\\.|/\\.\\.", "a.parentNode", - ">|/", "jQuery.sibling(a.firstChild)", - "\\+", "jQuery.nth(a,2,'nextSibling')", - "~", function(a){ - var s = jQuery.sibling(a.parentNode.firstChild); - return s.slice(0, jQuery.inArray(a,s)); - } - ], - - /** - * @name $.find - * @type Array - * @private - * @cat Core - */ - find: function( t, context ) { - // Quickly handle non-string expressions - if ( typeof t != "string" ) - return [ t ]; - - // Make sure that the context is a DOM Element - if ( context && context.nodeType == undefined ) - context = null; - - // Set the correct context (if none is provided) - context = context || document; - - // Handle the common XPath // expression - if ( !t.indexOf("//") ) { - context = context.documentElement; - t = t.substr(2,t.length); - - // And the / root expression - } else if ( !t.indexOf("/") ) { - context = context.documentElement; - t = t.substr(1,t.length); - if ( t.indexOf("/") >= 1 ) - t = t.substr(t.indexOf("/"),t.length); - } - - // Initialize the search - var ret = [context], done = [], last = null; - - // Continue while a selector expression exists, and while - // we're no longer looping upon ourselves - while ( t && last != t ) { - var r = []; - last = t; - - t = jQuery.trim(t).replace( /^\/\//i, "" ); - - var foundToken = false; - - // An attempt at speeding up child selectors that - // point to a specific element tag - var re = /^[\/>]\s*([a-z0-9*-]+)/i; - var m = re.exec(t); - - if ( m ) { - // Perform our own iteration and filter - for ( var i = 0, rl = ret.length; i < rl; i++ ) - for ( var c = ret[i].firstChild; c; c = c.nextSibling ) - if ( c.nodeType == 1 && ( c.nodeName == m[1].toUpperCase() || m[1] == "*" ) ) - r.push( c ); - - ret = r; - t = jQuery.trim( t.replace( re, "" ) ); - foundToken = true; - } else { - // Look for pre-defined expression tokens - for ( var i = 0; i < jQuery.token.length; i += 2 ) { - // Attempt to match each, individual, token in - // the specified order - var re = new RegExp("^(" + jQuery.token[i] + ")"); - var m = re.exec(t); - - // If the token match was found - if ( m ) { - // Map it against the token's handler - r = ret = jQuery.map( ret, jQuery.token[i+1].constructor == Function ? - jQuery.token[i+1] : - function(a){ return eval(jQuery.token[i+1]); }); - - // And remove the token - t = jQuery.trim( t.replace( re, "" ) ); - foundToken = true; - break; - } - } - } - - // See if there's still an expression, and that we haven't already - // matched a token - if ( t && !foundToken ) { - // Handle multiple expressions - if ( !t.indexOf(",") || !t.indexOf("|") ) { - // Clean teh result set - if ( ret[0] == context ) ret.shift(); - - // Merge the result sets - jQuery.merge( done, ret ); - - // Reset the context - r = ret = [context]; - - // Touch up the selector string - t = " " + t.substr(1,t.length); - - } else { - // Optomize for the case nodeName#idName - var re2 = /^([a-z0-9_-]+)(#)([a-z0-9\\*_-]*)/i; - var m = re2.exec(t); - - // Re-organize the results, so that they're consistent - if ( m ) { - m = [ 0, m[2], m[3], m[1] ]; - - } else { - // Otherwise, do a traditional filter check for - // ID, class, and element selectors - re2 = /^([#.]?)([a-z0-9\\*_-]*)/i; - m = re2.exec(t); - } - - // Try to do a global search by ID, where we can - if ( m[1] == "#" && ret[ret.length-1].getElementById ) { - // Optimization for HTML document case - var oid = ret[ret.length-1].getElementById(m[2]); - - // Do a quick check for node name (where applicable) so - // that div#foo searches will be really fast - ret = r = oid && - (!m[3] || oid.nodeName == m[3].toUpperCase()) ? [oid] : []; - - // Use the DOM 0 shortcut for the body element - } else if ( m[1] == "" && m[2] == "body" ) { - ret = r = [ document.body ]; - - } else { - // Pre-compile a regular expression to handle class searches - if ( m[1] == "." ) - var rec = new RegExp("(^|\\s)" + m[2] + "(\\s|$)"); - - // We need to find all descendant elements, it is more - // efficient to use getAll() when we are already further down - // the tree - we try to recognize that here - for ( var i = 0, rl = ret.length; i < rl; i++ ) - jQuery.merge( r, - m[1] != "" && ret.length != 1 ? - jQuery.getAll( ret[i], [], m[1], m[2], rec ) : - ret[i].getElementsByTagName( m[1] != "" || m[0] == "" ? "*" : m[2] ) - ); - - // It's faster to filter by class and be done with it - if ( m[1] == "." && ret.length == 1 ) - r = jQuery.grep( r, function(e) { - return rec.test(e.className); - }); - - // Same with ID filtering - if ( m[1] == "#" && ret.length == 1 ) { - // Remember, then wipe out, the result set - var tmp = r; - r = []; - - // Then try to find the element with the ID - for ( var i = 0, tl = tmp.length; i < tl; i++ ) - if ( tmp[i].getAttribute("id") == m[2] ) { - r = [ tmp[i] ]; - break; - } - } - - ret = r; - } - - t = t.replace( re2, "" ); - } - - } - - // If a selector string still exists - if ( t ) { - // Attempt to filter it - var val = jQuery.filter(t,r); - ret = r = val.r; - t = jQuery.trim(val.t); - } - } - - // Remove the root context - if ( ret && ret[0] == context ) ret.shift(); - - // And combine the results - jQuery.merge( done, ret ); - - return done; - }, - - getAll: function( o, r, token, name, re ) { - for ( var s = o.firstChild; s; s = s.nextSibling ) - if ( s.nodeType == 1 ) { - var add = true; - - if ( token == "." ) - add = s.className && re.test(s.className); - else if ( token == "#" ) - add = s.getAttribute('id') == name; - if ( add ) - r.push( s ); - - if ( token == "#" && r.length ) break; - - if ( s.firstChild ) - jQuery.getAll( s, r, token, name, re ); - } - - return r; - }, - attr: function(elem, name, value){ var fix = { "for": "htmlFor", @@ -1781,84 +1452,7 @@ jQuery.extend({ return elem[name]; } }, - - // The regular expressions that power the parsing engine - parse: [ - // Match: [@value='test'], [@foo] - "\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]", - - // Match: [div], [div p] - "(\\[)\\s*(.*?)\\s*\\]", - - // Match: :contains('foo') - "(:)S\\(\"?'?([^\\)]*?)\"?'?\\)", - - // Match: :even, :last-chlid - "([:.#]*)S" - ], - - filter: function(t,r,not) { - // Look for common filter expressions - while ( t && /^[a-z[({<*:.#]/i.test(t) ) { - - var p = jQuery.parse; - - for ( var i = 0, pl = p.length; i < pl; i++ ) { - - // Look for, and replace, string-like sequences - // and finally build a regexp out of it - var re = new RegExp( - "^" + p[i].replace("S", "([a-z*_-][a-z0-9_-]*)"), "i" ); - - var m = re.exec( t ); - - if ( m ) { - // Re-organize the first match - if ( jQuery.expr[ m[1] ]._resort ) - m = jQuery.expr[ m[1] ]._resort( m ); - - // Remove what we just matched - t = t.replace( re, "" ); - - break; - } - } - - // :not() is a special case that can be optimized by - // keeping it out of the expression list - if ( m[1] == ":" && m[2] == "not" ) - r = jQuery.filter(m[3], r, true).r; - - // Handle classes as a special case (this will help to - // improve the speed, as the regexp will only be compiled once) - else if ( m[1] == "." ) { - - var re = new RegExp("(^|\\s)" + m[2] + "(\\s|$)"); - r = jQuery.grep( r, function(e){ - return re.test(e.className || ''); - }, not); - - // Otherwise, find the expression to execute - } else { - var f = jQuery.expr[m[1]]; - if ( typeof f != "string" ) - f = jQuery.expr[m[1]][m[2]]; - - // Build a custom macro to enclose it - eval("f = function(a,i){" + - ( jQuery.expr[ m[1] ]._prefix || "" ) + - "return " + f + "}"); - - // Execute it against the current filter - r = jQuery.grep( r, f, not ); - } - } - - // Return an array of filtered elements (r) - // and the modified expression string (t) - return { r: r, t: t }; - }, - + /** * Remove the whitespace from the beginning and end of a string. * @@ -1874,25 +1468,6 @@ jQuery.extend({ return t.replace(/^\s+|\s+$/g, ""); }, - /** - * All ancestors of a given element. - * - * @private - * @name $.parents - * @type Array - * @param Element elem The element to find the ancestors of. - * @cat DOM/Traversing - */ - parents: function( elem ){ - var matched = []; - var cur = elem.parentNode; - while ( cur && cur != document ) { - matched.push( cur ); - cur = cur.parentNode; - } - return matched; - }, - makeArray: function( a ) { var r = [];