X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=5fd368aa077bf1eb3ae4d8b600b9599c81e3b12d;hb=4dcbfc92c391983059b920d2a500c1246869f4c7;hp=1ca039b70b178451a930d2b4b97a95decba689f9;hpb=38fa3cfc34a61defc9534c8303ba8c4c50bacb86;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 1ca039b..5fd368a 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -28,7 +28,7 @@ window.undefined = window.undefined; * @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 ) @@ -67,7 +67,7 @@ function jQuery(a,c) { // If so, execute it in context if ( fn && fn.constructor == 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 @@ -390,6 +390,8 @@ jQuery.fn = jQuery.prototype = { * @test ok( $('#en').attr('lang') == "en", 'Check for lang attribute' ); * @test ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' ); * @test ok( $('#name').attr('name') == "name", 'Check for name attribute' ); + * @test ok( $('#text1').attr('name') == "action", 'Check for name attribute' ); + * @test ok( $('#form').attr('action') == "formaction", 'Check for action attribute' ); * * @name attr * @type Object @@ -435,6 +437,10 @@ jQuery.fn = jQuery.prototype = { * * @test $("#name").attr('name', 'something'); * ok( $("#name").name() == 'something', 'Set name attribute' ); + * @test $("#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 @@ -581,19 +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("
"); * @before

Test Paragraph.

* @result

Test Paragraph.

* * @test var defaultText = 'Try them out:' * var result = $('#first').wrap('
').text(); - * ok( defaultText == result, 'Check for simple wrapping' ); - * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper div has class "red"' ); - * - * @test var defaultText = 'Try them out:' - * var result = $('#first').wrap('
xxyy
').text() - * ok( 'xx' + defaultText + 'yy' == result, 'Check for wrapping' ); - * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper div has class "red"' ); + * ok( defaultText == result, 'Check for wrapping of on-the-fly html' ); + * ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' ); * * @name wrap * @type jQuery @@ -611,9 +615,17 @@ jQuery.fn = jQuery.prototype = { * provided and finding the deepest ancestor element within its * structure - it is that element that will en-wrap everything else. * - * @example $("p").wrap("
"); - * @before

Test Paragraph.

- * @result

Test Paragraph.

+ * This does not work with elements that contain text. Any necessary text + * must be added after the wrapping is done. + * + * @example $("p").wrap( document.getElementById('content') ); + * @before

Test Paragraph.

+ * @result

Test Paragraph.

+ * + * @test var defaultText = 'Try them out:' + * var result = $('#first').wrap(document.getElementById('empty')).parent(); + * ok( result.is('ol'), 'Check for element wrapping' ); + * ok( result.text() == defaultText, 'Check for element wrapping' ); * * @name wrap * @type jQuery @@ -655,6 +667,12 @@ jQuery.fn = jQuery.prototype = { * var result = $('#first').append('buga'); * ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); * + * @test 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. @@ -1029,7 +1047,7 @@ jQuery.fn = jQuery.prototype = { * @example $("p").not("#selected") * @before

Hello

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 @@ -1159,7 +1177,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 ) { @@ -1206,7 +1224,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 @@ -1506,19 +1537,31 @@ jQuery.extend({ 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 elements + // Form attributes enabled: "!a.disabled", disabled: "a.disabled", checked: "a.checked", - selected: "a.selected" + selected: "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'", + input: "a.nodeName.toLowerCase()=='input'||a.nodeName.toLowerCase()=='select'||a.nodeName.toLowerCase()=='textarea'" }, ".": "jQuery.className.has(a,m[2])", "@": { "=": "z==m[4]", "!=": "z!=m[4]", - "^=": "!z.indexOf(m[4])", - "$=": "z.substr(z.length - m[4].length,m[4].length)==m[4]", - "*=": "z.indexOf(m[4])>=0", + "^=": "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" }, "[": "jQuery.find(m[2],a).length" @@ -1543,7 +1586,7 @@ jQuery.extend({ * @test t( "Element Selector", "div", ["main","foo"] ); * @test t( "Element Selector", "body", ["body"] ); * @test t( "Element Selector", "html", ["html"] ); - * @test cmpOK( $("*").size(), ">=", 30, "Element Selector" ); + * @test ok( $("*").size() >= 30, "Element Selector" ); * @test t( "Parent Element", "div div", ["foo"] ); * * @test t( "ID Selector", "#body", ["body"] ); @@ -1577,6 +1620,11 @@ jQuery.extend({ * @test t( "Attribute Exists", "a[@title]", ["google"] ); * @test t( "Attribute Exists", "*[@title]", ["google"] ); * @test t( "Attribute Exists", "[@title]", ["google"] ); + * + * @test t( "Non-existing part of attribute [@name*=bla]", "[@name*=bla]", [] ); + * @test t( "Non-existing start of attribute [@name^=bla]", "[@name^=bla]", [] ); + * @test t( "Non-existing end of attribute [@name$=bla]", "[@name$=bla]", [] ); + * * @test t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] ); * @test t( "Attribute Equals", 'a[@rel="bookmark"]', ["simon1"] ); * @test t( "Attribute Equals", "a[@rel=bookmark]", ["simon1"] ); @@ -1600,7 +1648,7 @@ jQuery.extend({ * @test t( "Element Preceded By", "p ~ div", ["foo"] ); * @test t( "Not", "a.blog:not(.link)", ["mark"] ); * - * @test cmpOK( jQuery.find("//*").length, ">=", 30, "All Elements (//*)" ); + * @test ok( jQuery.find("//*").length >= 30, "All Elements (//*)" ); * @test t( "All Div Elements", "//div", ["main","foo"] ); * @test t( "Absolute Path", "/html/body", ["body"] ); * @test t( "Absolute Path w/ *", "/* /body", ["body"] ); @@ -1627,6 +1675,20 @@ jQuery.extend({ * @test t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] ); * @test t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] ); * + * @test t( "Grouped Form Elements", "input[@name='foo[bar]']", ["hidden2"] ); + * + * @test t( "All Children of ID", "#foo/*", ["sndp", "en", "sap"] ); + * @test t( "All Children of ID with no children", "#firstUL/*", [] ); + * + * @test t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "area1", "select1", "select2", "select3"] ); + * @test t( "Form element :radio", ":radio", ["radio1", "radio2"] ); + * @test t( "Form element :checkbox", ":checkbox", ["check1", "check2"] ); + * @test t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name"] ); + * + * @test t( ":not() Existing attribute", "input:not([@name])", ["text2", "check2"]); + * @test t( ":not() Equals attribute", "select:not([@name=select1])", ["select2", "select3"]); + * @test t( ":not() Equals quoted attribute", "select:not([@name='select1'])", ["select2", "select3"]); + * * @name $.find * @type Array * @private @@ -1759,16 +1821,16 @@ jQuery.extend({ // The regular expressions that power the parsing engine parse: [ // Match: [@value='test'], [@foo] - [ "\\[ *(@)S *([!*$^=]*) *Q\\]", 1 ], + "\\[ *(@)S *([!*$^=]*)Q\\]", // Match: [div], [div p] - [ "(\\[)Q\\]", 0 ], + "(\\[)Q\\]", // Match: :contains('foo') - [ "(:)S\\(Q\\)", 0 ], + "(:)S\\(Q\\)", // Match: :even, :last-chlid - [ "([:.#]*)S", 0 ] + "([:.#]*)S" ], filter: function(t,r,not) { @@ -1781,21 +1843,28 @@ jQuery.extend({ var p = jQuery.parse; for ( var i = 0; i < p.length; i++ ) { - var re = new RegExp( "^" + p[i][0] - + // 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', " *'?\"?([^'\"]*?)'?\"? *" ), "i" ); + .replace( 'Q', " *('|\"|)([^'\"]*?)\\"+br+" *" ), "i" ); var m = re.exec( t ); if ( m ) { // Re-organize the match - if ( p[i][1] ) - m = ["", m[1], m[3], m[2], m[4]]; - + if(br == 4){ + 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, "" ); @@ -1874,15 +1943,17 @@ jQuery.extend({ */ sibling: function(elem, pos, not) { var elems = []; - - var siblings = elem.parentNode.childNodes; - for ( var i = 0; i < siblings.length; i++ ) { - if ( not === true && siblings[i] == elem ) continue; - - if ( siblings[i].nodeType == 1 ) - elems.push( siblings[i] ); - if ( siblings[i] == elem ) - elems.n = elems.length - 1; + + if(elem) { + var siblings = elem.parentNode.childNodes; + for ( var i = 0; i < siblings.length; i++ ) { + if ( not === true && siblings[i] == elem ) continue; + + if ( siblings[i].nodeType == 1 ) + elems.push( siblings[i] ); + if ( siblings[i] == elem ) + elems.n = elems.length - 1; + } } return jQuery.extend( elems, { @@ -2120,8 +2191,11 @@ jQuery.extend({ var c = this.events[event.type]; + var args = [].slice.call( arguments, 1 ); + args.unshift( event ); + for ( var j in c ) { - if ( c[j].apply( this, [event] ) === false ) { + if ( c[j].apply( this, args ) === false ) { event.preventDefault(); event.stopPropagation(); returnValue = false; @@ -2605,6 +2679,10 @@ jQuery.macros = { * @before * @result "test" * + * @test ok( $(document.getElementById('main')).id() == "main", "Check for id" ); + * @test ok( $("#foo").id() == "foo", "Check for id" ); + * @test ok( !$("head").id(), "Check for id" ); + * * @name id * @type String * @cat DOM/Attributes @@ -2631,6 +2709,9 @@ jQuery.macros = { * @before * @result "my image" * + * @test ok( $(document.getElementById('google')).title() == "Google!", "Check for title" ); + * @test ok( !$("#yahoo").title(), "Check for title" ); + * * @name title * @type String * @cat DOM/Attributes @@ -2657,6 +2738,10 @@ jQuery.macros = { * @before * @result "username" * + * @test ok( $(document.getElementById('text1')).name() == "action", "Check for name" ); + * @test ok( $("#hidden1").name() == "hidden", "Check for name" ); + * @test ok( !$("#area1").name(), "Check for name" ); + * * @name name * @type String * @cat DOM/Attributes @@ -2912,6 +2997,8 @@ jQuery.macros = { * @before

Hello

Hello Again

And Again

* @result [

Hello

,

And Again

] * + * @test isSet( $("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" ); + * * @name siblings * @type jQuery * @cat DOM/Traversing @@ -2925,12 +3012,15 @@ jQuery.macros = { * @before
Hello

Hello Again

And Again

* @result [

Hello Again

] * + * @test isSet( $("#sndp").siblings("[code]").get(), q("sap"), "Check for filtered siblings (has code child element)" ); + * @test 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)", /**