X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=d50274fea447852a008634c1dfbeab5833df54e7;hb=d9ebe848d01d90bbc7397e6f115d47bd44ebfbf8;hp=829ef4a17b21474d3d4acd287e7ffb8df6aef212;hpb=feabeb8572979f7888bd73e80f436bece1448e5a;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 829ef4a..d50274f 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -154,6 +154,7 @@ if ( typeof $ != "undefined" ) * behaves just like $(document).ready(), in that it should be used to wrap * all of the other $() operations on your page. While this function is, * technically, chainable - there really isn't much use for chaining against it. + * You can have as many $(document).ready events on your page as you like. * * @example $(function(){ * // Document is ready @@ -391,8 +392,8 @@ jQuery.fn = jQuery.prototype = { * ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' ); * ok( $('#name').attr('name') == "name", 'Check for name attribute' ); * ok( $('#text1').attr('name') == "action", 'Check for name attribute' ); - * ok( $('#form').attr('action') == "formaction", 'Check for action attribute' ); - * + * ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' ); + * * @name attr * @type Object * @param String name The name of the property to access. @@ -493,7 +494,7 @@ jQuery.fn = jQuery.prototype = { * representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth, * borderStyle, borderBottomWidth etc. * - * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"'); + * @test ok( $('#main').css("display") == 'none', 'Check for css property "display"'); * * @name css * @type Object @@ -667,12 +668,6 @@ jQuery.fn = jQuery.prototype = { * var result = $('#first').append('buga'); * ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); * - * reset(); - * var expected = "Try them out: bla "; - * $('#first').append(" "); - * $('#first').append("bla "); - * ok( expected == $('#first').text(), "Check for appending of spaces" ); - * * @name append * @type jQuery * @param String html A string of HTML, that will be created on the fly and appended to the target. @@ -982,6 +977,12 @@ jQuery.fn = jQuery.prototype = { * @result $("p").filter(".selected") == [

Hello

] * * @test isSet( $("input").filter(":checked").get(), q("radio2", "check1"), "Filter elements" ); + * @test $("input").filter(":checked",function(i){ + * ok( this == q("radio2", "check1")[i], "Filter elements, context" ); + * }); + * @test $("#main > p#ap > a").filter("#foobar",function(){},function(i){ + * ok( this == q("google","groups", "mark")[i], "Filter elements, else context" ); + * }); * * @name filter * @type jQuery @@ -1160,52 +1161,6 @@ jQuery.fn = jQuery.prototype = { }, /** - * Executes the first callback for every element that fits the expression - * and executes the second callback for every element that does not fit - * the expression. - * - * @example $('div').ifelse(':visible', - * function() { $(this).slideUp(); }, - function() { $(this).slideDown(); } - * ); - * @desc Slides down all visible div elements and slides down all others - * - * @test var checked = 0, notChecked = 0; - * var inputChecked = $(':input').ifelse(':checked', - * function() { checked++; }, - * function() { notChecked++ } - * ); - * ok( checked == 2, 'Check is if/else: Count checked elements' ); - * ok( notChecked == 12, 'Check is if/else: Count unchecked elements' ); - * - * $('#first, #foo, #ap').ifelse('p', - * function() { $(this).html('me == p') }, - * function() { $(this).html('me != p') } - * ); - * ok( $('#first').text() == 'me == p', 'Check filter-if-clause' ); - * ok( $('#foo').text() == 'me != p', 'Check else-clause' ); - * ok( $('#ap').text() == 'me == p', 'Check filter-if-clause' ); - * - * @name ifelse - * @type jQuery - * @param String expression The expression with which to filter - * @param Function ifCallback Called for elements that fit the expression - * @param Function elseCallback Called for elements that don't fit the expression - * @cat DOM/Traversing - */ - ifelse: function(expr, ifCallback, elseCallback) { - var ifCallback = ifCallback || function() {}; - var elseCalllback = elseCallback || function() {}; - return this.each(function() { - if($(this).is(expr)) { - ifCallback.apply(this); - } else { - elseCallback.apply(this); - } - }); - }, - - /** * * * @private @@ -1253,17 +1208,23 @@ jQuery.fn = jQuery.prototype = { */ pushStack: function(a,args) { var fn = args && args[args.length-1]; + var fn2 = args && args[args.length-2]; + + if ( fn && fn.constructor != Function ) fn = null; + if ( fn2 && fn2.constructor != Function ) fn2 = null; - if ( !fn || fn.constructor != Function ) { + if ( !fn ) { if ( !this.stack ) this.stack = []; this.stack.push( this.get() ); this.get( a ); } else { var old = this.get(); this.get( a ); - if ( typeof fn == "function" ) - this.each( fn ); - this.get( old ); + + if ( fn2 && a.length || !fn2 ) + this.each( fn2 || fn ).get( old ); + else + this.get( old ).each( fn ); } return this; @@ -1886,13 +1847,13 @@ jQuery.extend({ // The regular expressions that power the parsing engine parse: [ // Match: [@value='test'], [@foo] - "\\[ *(@)S *([!*$^=]*)Q\\]", + "\\[ *(@)S *([!*$^=]*) *('?\"?)(.*?)\\4 *\\]", // Match: [div], [div p] - "(\\[)Q\\]", + "(\\[)\s*(.*?)\s*\\]", // Match: :contains('foo') - "(:)S\\(Q\\)", + "(:)S\\(\"?'?([^\\)]*?)\"?'?\\)", // Match: :even, :last-chlid "([:.#]*)S" @@ -1908,28 +1869,19 @@ jQuery.extend({ var p = jQuery.parse; for ( var i = 0; i < p.length; i++ ) { - // get number for backreference - var br = 0; - if(p[i].indexOf('Q') != -1){ - br = p[i].replace(/\\\(/g,'').match(/\(|S/g).length+1; - } - var re = new RegExp( "^" + p[i] - - // Look for a string-like sequence - .replace( 'S', "([a-z*_-][a-z0-9_-]*)" ) - - // Look for something (optionally) enclosed with quotes - .replace( 'Q', " *('|\"|)([^'\"]*?)\\"+br+" *" ), "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 match - if(br == 4){ + // Re-organize the first match + if ( !i ) m = ["",m[1], m[3], m[2], m[5]]; - } else if(br != 0) { - m.splice(br,1); - } + // Remove what we just matched t = t.replace( re, "" );