Test Paragraph.
X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=deb214bcd7f3f34ea4507a6a9c06920a9e4f0c84;hb=3527e8f6745786e65dc209f1518372f3270a9920;hp=98825c3378637b89839d8240c7fb7188e5a7451c;hpb=e2d3c4341908aa2a36023c91a8a684d10e93339a;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 98825c3..deb214b 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -16,22 +16,22 @@ window.undefined = window.undefined; * Create a new jQuery Object * * @test ok( Array.prototype.push, "Array.push()" ); - * @test ok( Function.prototype.apply, "Function.apply()" ); - * @test ok( document.getElementById, "getElementById" ); - * @test ok( document.getElementsByTagName, "getElementsByTagName" ); - * @test ok( RegExp, "RegExp" ); - * @test ok( jQuery, "jQuery" ); - * @test ok( $, "$()" ); + * ok( Function.prototype.apply, "Function.apply()" ); + * ok( document.getElementById, "getElementById" ); + * ok( document.getElementsByTagName, "getElementsByTagName" ); + * ok( RegExp, "RegExp" ); + * ok( jQuery, "jQuery" ); + * ok( $, "$()" ); * * @constructor * @private * @name jQuery * @cat Core */ -function jQuery(a,c) { +jQuery = function(a,c) { // Shortcut for document ready (because $(document).each() is silly) - if ( a && a.constructor == Function && jQuery.fn.ready ) + if ( a && typeof a == "function" && jQuery.fn.ready ) return jQuery(document).ready(a); // Make sure that a selection was provided @@ -65,9 +65,9 @@ function jQuery(a,c) { var fn = arguments[ arguments.length - 1 ]; // If so, execute it in context - if ( fn && fn.constructor == Function ) + if ( fn && typeof fn == "function" ) this.each(fn); -} +}; // Map over the $ in case of overwrite if ( typeof $ != "undefined" ) @@ -203,7 +203,7 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").length, "==", 2, "Get Number of Elements Found" ); + * @test ok( $("div").length == 2, "Get Number of Elements Found" ); * * @property * @name length @@ -218,7 +218,7 @@ jQuery.fn = jQuery.prototype = { * @before * @result 2 * - * @test cmpOK( $("div").size(), "==", 2, "Get Number of Elements Found" ); + * @test ok( $("div").size() == 2, "Get Number of Elements Found" ); * * @name size * @type Number @@ -252,7 +252,7 @@ jQuery.fn = jQuery.prototype = { * @before * @result [ ] * - * @test cmpOK( $("div").get(0), "==", document.getElementById("main"), "Get A Single Element" ); + * @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" ); * * @name get * @type Element @@ -349,14 +349,14 @@ jQuery.fn = jQuery.prototype = { * @result -1 * * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" ); - * @test ok( $([window, document]).index(document) == 1, "Check for index of elements" ); - * @test var inputElements = $('#radio1,#radio2,#check1,#check2'); - * @test ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" ); - * @test ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" ); - * @test ok( inputElements.index(window) == -1, "Check for not found index" ); - * @test ok( inputElements.index(document) == -1, "Check for not found index" ); + * ok( $([window, document]).index(document) == 1, "Check for index of elements" ); + * var inputElements = $('#radio1,#radio2,#check1,#check2'); + * ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" ); + * ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" ); + * ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" ); + * ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" ); + * ok( inputElements.index(window) == -1, "Check for not found index" ); + * ok( inputElements.index(document) == -1, "Check for not found index" ); * * @name index * @type Number @@ -381,10 +381,18 @@ jQuery.fn = jQuery.prototype = { * @result test.jpg * * @test ok( $('#text1').attr('value') == "Test", 'Check for value attribute' ); - * @test ok( $('#text1').attr('type') == "text", 'Check for type attribute' ); - * @test ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' ); - * @test ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' ); - * + * ok( $('#text1').attr('type') == "text", 'Check for type attribute' ); + * ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' ); + * ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' ); + * ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' ); + * ok( $('#google').attr('title') == "Google!", 'Check for title attribute' ); + * ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' ); + * ok( $('#en').attr('lang') == "en", 'Check for lang attribute' ); + * 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').indexOf("formaction") >= 0, 'Check for action attribute' ); + * * @name attr * @type Object * @param String name The name of the property to access. @@ -427,6 +435,13 @@ jQuery.fn = jQuery.prototype = { * } * ok( pass, "Set Attribute" ); * + * $("#name").attr('name', 'something'); + * ok( $("#name").name() == 'something', 'Set name attribute' ); + * $("#check2").attr('checked', true); + * ok( document.getElementById('check2').checked == true, 'Set checked attribute' ); + * $("#check2").attr('checked', false); + * ok( document.getElementById('check2').checked == false, 'Set checked attribute' ); + * * @name attr * @type jQuery * @param String key The name of the property to set. @@ -466,8 +481,19 @@ jQuery.fn = jQuery.prototype = { * @example $("p").css("color"); * @before
Test Paragraph.
* @result red + * @desc Retrieves the color style of the first paragraph * - * @test ok( $('#foo').css("display") == 'block', 'Check for css property "display"'); + * @example $("p").css("fontWeight"); + * @beforeTest Paragraph.
+ * @result bold + * @desc Retrieves the font-weight style of the first paragraph. + * Note that for all style properties with a dash (like 'font-weight'), you have to + * write it in camelCase. In other words: Every time you have a '-' in a + * property, remove it and replace the next character with an uppercase + * representation of itself. Eg. fontWeight, fontSize, fontFamily, borderWidth, + * borderStyle, borderBottomWidth etc. + * + * @test ok( $('#main').css("display") == 'none', 'Check for css property "display"'); * * @name css * @type Object @@ -485,9 +511,9 @@ jQuery.fn = jQuery.prototype = { * @resultTest Paragraph.
* * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - * @test $('#foo').css({display: 'none'}); + * $('#foo').css({display: 'none'}); * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - * @test $('#foo').css({display: 'block'}); + * $('#foo').css({display: 'block'}); * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); * * @name css @@ -502,11 +528,13 @@ jQuery.fn = jQuery.prototype = { * @example $("p").css("color","red"); * @beforeTest Paragraph.
* @resultTest Paragraph.
+ * @desc Changes the color of all paragraphs to red + * * * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); - * @test $('#foo').css('display', 'none'); + * $('#foo').css('display', 'none'); * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden'); - * @test $('#foo').css('display', 'block'); + * $('#foo').css('display', 'block'); * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); * * @name css @@ -559,14 +587,17 @@ jQuery.fn = jQuery.prototype = { * and finds the deepest ancestor element within its * structure - it is that element that will en-wrap everything else. * + * This does not work with elements that contain text. Any necessary text + * must be added after the wrapping is done. + * * @example $("p").wrap(""); * @beforeTest Paragraph.
* @resultTest Paragraph.
Test Paragraph.
- * @resultTest Paragraph.
Test Paragraph.
+ * @resultTest Paragraph.
Hello
How are you?
* @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 * @param String expr An expression to search with. @@ -972,7 +1019,7 @@ jQuery.fn = jQuery.prototype = { t.constructor == Boolean && ( t ? this.get() : [] ) || - t.constructor == Function && + typeof t == "function" && jQuery.grep( this, t ) || jQuery.filter(t,this).r, arguments ); @@ -1000,7 +1047,8 @@ jQuery.fn = jQuery.prototype = { * @example $("p").not("#selected") * @beforeHello
Hello Again
* @result [Hello
] - * @test cmpOK($("#main > p#ap > a").not("#google").length, "==", 2, ".not") + * + * @test ok($("#main > p#ap > a").not("#google").length == 2, ".not") * * @name not * @type jQuery @@ -1080,27 +1128,27 @@ jQuery.fn = jQuery.prototype = { * @desc An invalid expression always returns false. * * @test ok( $('#form').is('form'), 'Check for element: A form must be a form' ); - * @test ok( !$('#form').is('div'), 'Check for element: A form is not a div' ); - * @test ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' ); - * @test ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' ); - * @test ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' ); - * @test ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' ); - * @test ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' ); - * @test ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' ); - * @test ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' ); - * @test ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' ); - * @test ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' ); - * @test ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' ); - * @test ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' ); - * @test ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' ); - * @test ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' ); - * @test ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' ); - * @test ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' ); - * @test ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' ); - * @test ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' ); - * @test ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' ); - * @test ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' ); - * @test ok( !$('#foo').is(undefined), 'Expected false for an invalid expression - undefined' ); + * ok( !$('#form').is('div'), 'Check for element: A form is not a div' ); + * ok( $('#mark').is('.blog'), 'Check for class: Expected class "blog"' ); + * ok( !$('#mark').is('.link'), 'Check for class: Did not expect class "link"' ); + * ok( $('#simon').is('.blog.link'), 'Check for multiple classes: Expected classes "blog" and "link"' ); + * ok( !$('#simon').is('.blogTest'), 'Check for multiple classes: Expected classes "blog" and "link", but not "blogTest"' ); + * ok( $('#en').is('[@lang="en"]'), 'Check for attribute: Expected attribute lang to be "en"' ); + * ok( !$('#en').is('[@lang="de"]'), 'Check for attribute: Expected attribute lang to be "en", not "de"' ); + * ok( $('#text1').is('[@type="text"]'), 'Check for attribute: Expected attribute type to be "text"' ); + * ok( !$('#text1').is('[@type="radio"]'), 'Check for attribute: Expected attribute type to be "text", not "radio"' ); + * ok( $('#text2').is(':disabled'), 'Check for pseudoclass: Expected to be disabled' ); + * ok( !$('#text1').is(':disabled'), 'Check for pseudoclass: Expected not disabled' ); + * ok( $('#radio2').is(':checked'), 'Check for pseudoclass: Expected to be checked' ); + * ok( !$('#radio1').is(':checked'), 'Check for pseudoclass: Expected not checked' ); + * ok( $('#foo').is('[p]'), 'Check for child: Expected a child "p" element' ); + * ok( !$('#foo').is('[ul]'), 'Check for child: Did not expect "ul" element' ); + * ok( $('#foo').is('[p][a][code]'), 'Check for childs: Expected "p", "a" and "code" child elements' ); + * ok( !$('#foo').is('[p][a][code][ol]'), 'Check for childs: Expected "p", "a" and "code" child elements, but no "ol"' ); + * ok( !$('#foo').is(0), 'Expected false for an invalid expression - 0' ); + * ok( !$('#foo').is(null), 'Expected false for an invalid expression - null' ); + * ok( !$('#foo').is(''), 'Expected false for an invalid expression - ""' ); + * ok( !$('#foo').is(undefined), 'Expected false for an invalid expression - undefined' ); * * @name is * @type Boolean @@ -1110,7 +1158,7 @@ jQuery.fn = jQuery.prototype = { is: function(expr) { return expr ? jQuery.filter(expr,this).r.length > 0 : false; }, - + /** * * @@ -1130,7 +1178,7 @@ jQuery.fn = jQuery.prototype = { return this.each(function(){ var obj = this; - if ( table && this.nodeName == "TABLE" && a[0].nodeName != "THEAD" ) { + if ( table && this.nodeName.toUpperCase() == "TABLE" && a[0].nodeName.toUpperCase() != "THEAD" ) { var tbody = this.getElementsByTagName("tbody"); if ( !tbody.length ) { @@ -1159,17 +1207,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 ( fn.constructor == 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; @@ -1177,7 +1231,20 @@ jQuery.fn = jQuery.prototype = { }; /** - * + * Extends the jQuery object itself. Can be used to add both static + * functions and plugin methods. + * + * @example $.fn.extend({ + * check: function() { + * this.each(function() { this.checked = true; }); + * ), + * uncheck: function() { + * this.each(function() { this.checked = false; }); + * } + * }); + * $("input[@type=checkbox]").check(); + * $("input[@type=radio]").uncheck(); + * @desc Adds two plugin methods. * * @private * @name extend @@ -1313,9 +1380,22 @@ jQuery.extend({ o.className += ( o.className ? " " : "" ) + c; }, remove: function(o,c){ + /* o.className = !c ? "" : o.className.replace( - new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), ""); + new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");*/ + if( !c ) { + o.className = ""; + } else { + var classes = o.className.split(" "); + for(var i=0; iHello
And Again
* @result [Hello
And Again
* @result [Hello
,And Again
] * + * @test isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); + * * @name siblings * @type jQuery * @cat DOM/Traversing @@ -2895,12 +3047,15 @@ jQuery.macros = { * @beforeHello Again
And Again
* @result [Hello Again
] * + * @test isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" ); + * isSet( $("#sndp").siblings("[a]").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" ); + * * @name siblings * @type jQuery * @param String expr An expression to filter the sibling Elements with * @cat DOM/Traversing */ - siblings: jQuery.sibling, + siblings: "jQuery.sibling(a, null, true)", /** @@ -2911,6 +3066,8 @@ jQuery.macros = { * @beforeHello
And Again
* @result [ Hello Again ] * + * @test isSet( $("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" ); + * * @name children * @type jQuery * @cat DOM/Traversing @@ -2924,6 +3081,8 @@ jQuery.macros = { * @beforeHello Again
And Again
Hello Again
] * + * @test isSet( $("#foo").children("[code]").get(), q("sndp", "sap"), "Check for filtered children" ); + * * @name children * @type jQuery * @param String expr An expression to filter the child Elements with @@ -3052,6 +3211,16 @@ jQuery.macros = { * if ( div.get(i).className.indexOf("test") != -1 ) pass = false; * } * ok( pass, "Remove Class" ); + * + * reset(); + * + * var div = $("div").addClass("test").addClass("foo").addClass("bar"); + * div.removeClass("test").removeClass("bar").removeClass("foo"); + * var pass = true; + * for ( var i = 0; i < div.size(); i++ ) { + * if ( div.get(i).className.match(/test|bar|foo/) ) pass = false; + * } + * ok( pass, "Remove multiple classes" ); * * @name removeClass * @type jQuery @@ -3128,24 +3297,31 @@ jQuery.macros = { }, /** - * Binds a particular event (like click) to a each of a set of match elements. - * - * @example $("p").bind( "click", function() { alert("Hello"); } ) + * Binds a handler to a particular event (like click) for each matched element. + * The event handler is passed an event object that you can use to prevent + * default behaviour. To stop both default action and event bubbling, your handler + * has to return false. + * + * @example $("p").bind( "click", function() { + * alert( $(this).text() ); + * } ) * @beforeHello
- * @result [Hello
] - * - * Cancel a default action and prevent it from bubbling by returning false - * from your function. + * @result alert("Hello") * * @example $("form").bind( "submit", function() { return false; } ) + * @desc Cancel a default action and prevent it from bubbling by returning false + * from your function. * - * Cancel a default action by using the preventDefault method. - * - * @example $("form").bind( "submit", function() { e.preventDefault(); } ) + * @example $("form").bind( "submit", function(event) { + * event.preventDefault(); + * } ); + * @desc Cancel only the default action by using the preventDefault method. * - * Stop an event from bubbling by using the stopPropogation method. * - * @example $("form").bind( "submit", function() { e.stopPropogation(); } ) + * @example $("form").bind( "submit", function(event) { + * event.stopPropagation(); + * } ) + * @desc Stop only an event from bubbling by using the stopPropagation method. * * @name bind * @type jQuery