X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjquery%2Fjquery.js;h=287cd641328c0b9338ebef4d4f45c5059c58e2d6;hb=c6860d55d4d11206c2fe5d5fd3393d972d9a8ff3;hp=b7715be353ab57e0bdda6c71ab3e8d7b5059a33a;hpb=94b0bf5f2b7a4003196a679649567a13d0f13ad0;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index b7715be..287cd64 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1,5 +1,5 @@
/*
- * jQuery - New Wave Javascript
+ * jQuery @VERSION - New Wave Javascript
*
* Copyright (c) 2006 John Resig (jquery.com)
* Dual licensed under the MIT (MIT-LICENSE.txt)
@@ -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
*/
-jQuery = function(a,c) {
+var 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
@@ -50,8 +50,10 @@ jQuery = function(a,c) {
return new jQuery(a,c);
// Handle HTML strings
- var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
- if ( m ) a = jQuery.clean( [ m[1] ] );
+ if ( a.constructor == String ) {
+ var m = /^[^<]*(<.+>)[^>]*$/.exec(a);
+ if ( m ) a = jQuery.clean( [ m[1] ] );
+ }
// Watch for when an array is passed in
this.get( a.constructor == Array || a.length && !a.nodeType && a[0] != undefined && a[0].nodeType ?
@@ -61,12 +63,14 @@ jQuery = function(a,c) {
// Find the matching elements and save them for later
jQuery.find( a, c ) );
- // See if an extra function was provided
+ // See if an extra function was provided
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);
+
+ return this;
};
// Map over the $ in case of overwrite
@@ -95,7 +99,10 @@ if ( typeof $ != "undefined" )
* @result [
two
]
*
* @example $("
Hello
").appendTo("#body")
- * @desc Creates a div element (and all of its contents) dynamically, and appends it to the element with the ID of body.
+ * @desc Creates a div element (and all of its contents) dynamically,
+ * and appends it to the element with the ID of body. Internally, an
+ * element is created and it's innerHTML property set to the given markup.
+ * It is therefore both quite flexible and limited.
*
* @name $
* @param String expr An expression to search with, or a string of HTML to create on the fly.
@@ -154,6 +161,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
@@ -186,7 +194,7 @@ var $ = jQuery;
jQuery.fn = jQuery.prototype = {
/**
- * The current SVN version of jQuery.
+ * The current version of jQuery.
*
* @private
* @property
@@ -194,7 +202,7 @@ jQuery.fn = jQuery.prototype = {
* @type String
* @cat Core
*/
- jquery: "$Rev$",
+ jquery: "@VERSION",
/**
* The number of elements currently matched.
@@ -349,14 +357,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,18 +389,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' );
- * @test ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' );
- * @test ok( $('#google').attr('title') == "Google!", 'Check for title attribute' );
- * @test ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' );
- * @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' );
- *
+ * 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.
@@ -435,12 +443,27 @@ jQuery.fn = jQuery.prototype = {
* }
* ok( pass, "Set Attribute" );
*
- * @test $("#name").attr('name', 'something');
+ * $("#name").attr('name', 'something');
* ok( $("#name").name() == 'something', 'Set name attribute' );
- * @test $("#check2").attr('checked', true);
+ * $("#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' );
+ * $("#text1").attr('readonly', true);
+ * ok( document.getElementById('text1').readOnly == true, 'Set readonly attribute' );
+ * $("#text1").attr('readonly', false);
+ * ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' );
+ *
+ * @test stop();
+ * $.get('data/dashboard.xml', function(xml) {
+ * var titles = [];
+ * $('tab', xml).each(function() {
+ * titles.push($(this).attr('title'));
+ * });
+ * ok( titles[0] == 'Location', 'attr() in XML context: Check first title' );
+ * ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
+ * start();
+ * });
*
* @name attr
* @type jQuery
@@ -493,7 +516,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
@@ -511,10 +534,18 @@ jQuery.fn = jQuery.prototype = {
* @result
Test 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');
+ * $('#floatTest').css({styleFloat: 'right'});
+ * ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right');
+ * $('#floatTest').css({cssFloat: 'left'});
+ * ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left');
+ * $('#floatTest').css({'float': 'right'});
+ * ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right');
+ * $('#floatTest').css({'font-size': '30px'});
+ * ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px');
*
* @name css
* @type jQuery
@@ -532,10 +563,18 @@ jQuery.fn = jQuery.prototype = {
*
*
* @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');
+ * $('#floatTest').css('styleFloat', 'left');
+ * ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left');
+ * $('#floatTest').css('cssFloat', 'right');
+ * ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+ * $('#floatTest').css('float', 'left');
+ * ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left');
+ * $('#floatTest').css('font-size', '20px');
+ * ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px');
*
* @name css
* @type jQuery
@@ -644,7 +683,7 @@ jQuery.fn = jQuery.prototype = {
// Insert it before the element to be wrapped
this.parentNode.insertBefore( b, this );
- // Find he deepest point in the wrap structure
+ // Find the deepest point in the wrap structure
while ( b.firstChild )
b = b.firstChild;
@@ -666,12 +705,7 @@ jQuery.fn = jQuery.prototype = {
* @test var defaultText = 'Try them out:'
* 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" );
+ * ok( $('#select3').append('').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element');
*
* @name append
* @type jQuery
@@ -735,6 +769,7 @@ jQuery.fn = jQuery.prototype = {
* @test var defaultText = 'Try them out:'
* var result = $('#first').prepend('buga');
* ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
+ * ok( $('#select3').prepend('').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element');
*
* @name prepend
* @type jQuery
@@ -982,6 +1017,12 @@ jQuery.fn = jQuery.prototype = {
* @result $("p").filter(".selected") == [
]
+ *
* @test ok($("#main > p#ap > a").not("#google").length == 2, ".not")
*
* @name not
@@ -1127,27 +1170,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
@@ -1157,7 +1200,7 @@ jQuery.fn = jQuery.prototype = {
is: function(expr) {
return expr ? jQuery.filter(expr,this).r.length > 0 : false;
},
-
+
/**
*
*
@@ -1206,17 +1249,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;
@@ -1270,8 +1319,17 @@ jQuery.fn = jQuery.prototype = {
* @cat Javascript
*/
jQuery.extend = jQuery.fn.extend = function(obj,prop) {
+ // Watch for the case where null or undefined gets passed in by accident
+ if ( arguments.length > 1 && (prop === null || prop == undefined) )
+ return obj;
+
+ // If no property object was provided, then we're extending jQuery
if ( !prop ) { prop = obj; obj = this; }
+
+ // Extend the base object
for ( var i in prop ) obj[i] = prop[i];
+
+ // Return the modified object
return obj;
};
@@ -1363,7 +1421,7 @@ jQuery.extend({
fn.apply( obj[i], args || [i, obj[i]] );
else
for ( var i = 0; i < obj.length; i++ )
- fn.apply( obj[i], args || [i, obj[i]] );
+ if ( fn.apply( obj[i], args || [i, obj[i]] ) === false ) break;
return obj;
},
@@ -1373,10 +1431,6 @@ jQuery.extend({
o.className += ( o.className ? " " : "" ) + c;
},
remove: function(o,c){
- /*
- o.className = !c ? "" :
- o.className.replace(
- new RegExp("(^|\\s*\\b[^-])"+c+"($|\\b(?=[^-]))", "g"), "");*/
if( !c ) {
o.className = "";
} else {
@@ -1425,9 +1479,11 @@ jQuery.extend({
oHeight = e.offsetHeight;
oWidth = e.offsetWidth;
} else {
- e = jQuery(e.cloneNode(true)).css({
- visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
- }).appendTo(e.parentNode)[0];
+ e = jQuery(e.cloneNode(true))
+ .find(":radio").removeAttr("checked").end()
+ .css({
+ visibility: "hidden", position: "absolute", display: "block", right: "0", left: "0"
+ }).appendTo(e.parentNode)[0];
var parPos = jQuery.css(e.parentNode,"position");
if ( parPos == "" || parPos == "static" )
@@ -1444,14 +1500,19 @@ jQuery.extend({
});
return p == "height" ? oHeight : oWidth;
- } else if ( p == "opacity" && jQuery.browser.msie )
- return parseFloat( jQuery.curCSS(e,"filter").replace(/[^0-9.]/,"") ) || 1;
+ }
return jQuery.curCSS( e, p );
},
curCSS: function(elem, prop, force) {
var ret;
+
+ if (prop == 'opacity' && jQuery.browser.msie)
+ return jQuery.attr(elem.style, 'opacity');
+
+ if (prop == "float" || prop == "cssFloat")
+ prop = jQuery.browser.msie ? "styleFloat" : "cssFloat";
if (!force && elem.style[prop]) {
@@ -1464,6 +1525,9 @@ jQuery.extend({
} else if (document.defaultView && document.defaultView.getComputedStyle) {
+ if (prop == "cssFloat" || prop == "styleFloat")
+ prop = "float";
+
prop = prop.replace(/([A-Z])/g,"-$1").toLowerCase();
var cur = document.defaultView.getComputedStyle(elem, null);
@@ -1480,42 +1544,40 @@ jQuery.extend({
return ret;
},
-
+
clean: function(a) {
var r = [];
for ( var i = 0; i < a.length; i++ ) {
- if ( a[i].constructor == String ) {
-
- var table = "";
-
- if ( !a[i].indexOf("" + a[i] + "";
- } else if ( !a[i].indexOf("
" + a[i] + "";
- } else if ( !a[i].indexOf("
" + a[i] + "
";
- }
-
- var div = document.createElement("div");
- div.innerHTML = a[i];
-
- if ( table ) {
- div = div.firstChild;
- if ( table != "thead" ) div = div.firstChild;
- if ( table == "td" ) div = div.firstChild;
- }
-
+ var arg = a[i];
+ if ( arg.constructor == String ) { // Convert html string into DOM nodes
+ // Trim whitespace, otherwise indexOf won't work as expected
+ var s = jQuery.trim(arg), div = document.createElement("div"), wrap = [0,"",""];
+
+ if ( !s.indexOf("", ""];
+ else if ( !s.indexOf("", ""];
+ else if ( !s.indexOf("
", ""]; // tbody auto-inserted
+ else if ( !s.indexOf("
", "
"];
+
+ // Go to html and back, then peel off extra wrappers
+ div.innerHTML = wrap[1] + s + wrap[2];
+ while ( wrap[0]-- ) div = div.firstChild;
+
+ // Have to loop through the childNodes here to
+ // prevent a Safari crash with text nodes and /n characters
for ( var j = 0; j < div.childNodes.length; j++ )
r.push( div.childNodes[j] );
- } else if ( a[i].jquery || a[i].length && !a[i].nodeType )
- for ( var k = 0; k < a[i].length; k++ )
- r.push( a[i][k] );
- else if ( a[i] !== null )
- r.push( a[i].nodeType ? a[i] : document.createTextNode(a[i].toString()) );
+ }
+ else if ( arg.length != undefined && !arg.nodeType ) // Handles Array, jQuery, DOM NodeList collections
+ for ( var n = 0; n < arg.length; n++ )
+ r.push(arg[n]);
+ else
+ r.push( arg.nodeType ? arg : document.createTextNode(arg.toString()) );
}
+
return r;
},
@@ -1544,7 +1606,7 @@ jQuery.extend({
empty: "!a.childNodes.length",
// Text Check
- contains: "(a.innerText||a.innerHTML).indexOf(m[3])>=0",
+ 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'",
@@ -1554,7 +1616,7 @@ jQuery.extend({
enabled: "!a.disabled",
disabled: "a.disabled",
checked: "a.checked",
- selected: "a.selected",
+ selected: "a.selected || jQuery.attr(a, 'selected')",
// Form elements
text: "a.type=='text'",
@@ -1566,7 +1628,7 @@ jQuery.extend({
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'"
+ input: "a.nodeName.toLowerCase().match(/input|select|textarea|button/)"
},
".": "jQuery.className.has(a,m[2])",
"@": {
@@ -1597,110 +1659,113 @@ jQuery.extend({
/**
*
* @test t( "Element Selector", "div", ["main","foo"] );
- * @test t( "Element Selector", "body", ["body"] );
- * @test t( "Element Selector", "html", ["html"] );
- * @test ok( $("*").size() >= 30, "Element Selector" );
- * @test t( "Parent Element", "div div", ["foo"] );
- *
- * @test t( "ID Selector", "#body", ["body"] );
- * @test t( "ID Selector w/ Element", "body#body", ["body"] );
- * @test t( "ID Selector w/ Element", "ul#first", [] );
- *
- * @test t( "Class Selector", ".blog", ["mark","simon"] );
- * @test t( "Class Selector", ".blog.link", ["simon"] );
- * @test t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
- * @test t( "Parent Class Selector", "p .blog", ["mark","simon"] );
- *
- * @test t( "Comma Support", "a.blog, div", ["mark","simon","main","foo"] );
- * @test t( "Comma Support", "a.blog , div", ["mark","simon","main","foo"] );
- * @test t( "Comma Support", "a.blog ,div", ["mark","simon","main","foo"] );
- * @test t( "Comma Support", "a.blog,div", ["mark","simon","main","foo"] );
- *
- * @test t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
- * @test t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
- * @test t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
- * @test t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] );
- * @test t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
- * @test t( "All Children", "code > *", ["anchor1","anchor2"] );
- * @test t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
- * @test t( "Adjacent", "a + a", ["groups"] );
- * @test t( "Adjacent", "a +a", ["groups"] );
- * @test t( "Adjacent", "a+ a", ["groups"] );
- * @test t( "Adjacent", "a+a", ["groups"] );
- * @test t( "Adjacent", "p + p", ["ap","en","sap"] );
- * @test t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
- * @test t( "First Child", "p:first-child", ["firstp","sndp"] );
- * @test t( "Attribute Exists", "a[@title]", ["google"] );
- * @test t( "Attribute Exists", "*[@title]", ["google"] );
- * @test t( "Attribute Exists", "[@title]", ["google"] );
+ * t( "Element Selector", "body", ["body"] );
+ * t( "Element Selector", "html", ["html"] );
+ * ok( $("*").size() >= 30, "Element Selector" );
+ * t( "Parent Element", "div div", ["foo"] );
+ *
+ * t( "ID Selector", "#body", ["body"] );
+ * t( "ID Selector w/ Element", "body#body", ["body"] );
+ * t( "ID Selector w/ Element", "ul#first", [] );
+ *
+ * t( "Class Selector", ".blog", ["mark","simon"] );
+ * t( "Class Selector", ".blog.link", ["simon"] );
+ * t( "Class Selector w/ Element", "a.blog", ["mark","simon"] );
+ * t( "Parent Class Selector", "p .blog", ["mark","simon"] );
+ *
+ * t( "Comma Support", "a.blog, div", ["mark","simon","main","foo"] );
+ * t( "Comma Support", "a.blog , div", ["mark","simon","main","foo"] );
+ * t( "Comma Support", "a.blog ,div", ["mark","simon","main","foo"] );
+ * t( "Comma Support", "a.blog,div", ["mark","simon","main","foo"] );
+ *
+ * t( "Child", "p > a", ["simon1","google","groups","mark","yahoo","simon"] );
+ * t( "Child", "p> a", ["simon1","google","groups","mark","yahoo","simon"] );
+ * t( "Child", "p >a", ["simon1","google","groups","mark","yahoo","simon"] );
+ * t( "Child", "p>a", ["simon1","google","groups","mark","yahoo","simon"] );
+ * t( "Child w/ Class", "p > a.blog", ["mark","simon"] );
+ * t( "All Children", "code > *", ["anchor1","anchor2"] );
+ * t( "All Grandchildren", "p > * > *", ["anchor1","anchor2"] );
+ * t( "Adjacent", "a + a", ["groups"] );
+ * t( "Adjacent", "a +a", ["groups"] );
+ * t( "Adjacent", "a+ a", ["groups"] );
+ * t( "Adjacent", "a+a", ["groups"] );
+ * t( "Adjacent", "p + p", ["ap","en","sap"] );
+ * t( "Comma, Child, and Adjacent", "a + a, code > a", ["groups","anchor1","anchor2"] );
+ * t( "First Child", "p:first-child", ["firstp","sndp"] );
+ * t( "Attribute Exists", "a[@title]", ["google"] );
+ * t( "Attribute Exists", "*[@title]", ["google"] );
+ * 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"] );
- * @test t( "Multiple Attribute Equals", "input[@type='hidden'],input[@type='radio']", ["hidden1","radio1","radio2"] );
- * @test t( "Multiple Attribute Equals", "input[@type=\"hidden\"],input[@type='radio']", ["hidden1","radio1","radio2"] );
- * @test t( "Multiple Attribute Equals", "input[@type=hidden],input[@type=radio]", ["hidden1","radio1","radio2"] );
- *
- * @test t( "Attribute Begins With", "a[@href ^= 'http://www']", ["google","yahoo"] );
- * @test t( "Attribute Ends With", "a[@href $= 'org/']", ["mark"] );
- * @test t( "Attribute Contains", "a[@href *= 'google']", ["google","groups"] );
- * @test t( "First Child", "p:first-child", ["firstp","sndp"] );
- * @test t( "Last Child", "p:last-child", ["sap"] );
- * @test t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
- * @test t( "Empty", "ul:empty", ["firstUL"] );
- * @test t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
- * @test t( "Disabled UI Element", "input:disabled", ["text2"] );
- * @test t( "Checked UI Element", "input:checked", ["radio2","check1"] );
- * @test t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] );
- * @test t( "Text Contains", "a:contains('Google')", ["google","groups"] );
- * @test t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
- * @test t( "Element Preceded By", "p ~ div", ["foo"] );
- * @test t( "Not", "a.blog:not(.link)", ["mark"] );
- *
- * @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"] );
- * @test t( "Long Absolute Path", "/html/body/dl/div/div/p", ["sndp","en","sap"] );
- * @test t( "Absolute and Relative Paths", "/html//div", ["main","foo"] );
- * @test t( "All Children, Explicit", "//code/*", ["anchor1","anchor2"] );
- * @test t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] );
- * @test t( "Attribute Exists", "//a[@title]", ["google"] );
- * @test t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
- * @test t( "Parent Axis", "//p/..", ["main","foo"] );
- * @test t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
- * @test t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
- * @test t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
- *
- * @test t( "nth Element", "p:nth(1)", ["ap"] );
- * @test t( "First Element", "p:first", ["firstp"] );
- * @test t( "Last Element", "p:last", ["first"] );
- * @test t( "Even Elements", "p:even", ["firstp","sndp","sap"] );
- * @test t( "Odd Elements", "p:odd", ["ap","en","first"] );
- * @test t( "Position Equals", "p:eq(1)", ["ap"] );
- * @test t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
- * @test t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
- * @test t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
- * @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"]);
+ * t( "Non-existing part of attribute", "[@name*=bla]", [] );
+ * t( "Non-existing start of attribute", "[@name^=bla]", [] );
+ * t( "Non-existing end of attribute", "[@name$=bla]", [] );
+ *
+ * t( "Attribute Equals", "a[@rel='bookmark']", ["simon1"] );
+ * t( "Attribute Equals", 'a[@rel="bookmark"]', ["simon1"] );
+ * t( "Attribute Equals", "a[@rel=bookmark]", ["simon1"] );
+ * t( "Multiple Attribute Equals", "input[@type='hidden'],input[@type='radio']", ["hidden1","radio1","radio2"] );
+ * t( "Multiple Attribute Equals", "input[@type=\"hidden\"],input[@type='radio']", ["hidden1","radio1","radio2"] );
+ * t( "Multiple Attribute Equals", "input[@type=hidden],input[@type=radio]", ["hidden1","radio1","radio2"] );
+ *
+ * t( "Attribute Begins With", "a[@href ^= 'http://www']", ["google","yahoo"] );
+ * t( "Attribute Ends With", "a[@href $= 'org/']", ["mark"] );
+ * t( "Attribute Contains", "a[@href *= 'google']", ["google","groups"] );
+ * t( "First Child", "p:first-child", ["firstp","sndp"] );
+ * t( "Last Child", "p:last-child", ["sap"] );
+ * t( "Only Child", "a:only-child", ["simon1","anchor1","yahoo","anchor2"] );
+ * t( "Empty", "ul:empty", ["firstUL"] );
+ * t( "Enabled UI Element", "input:enabled", ["text1","radio1","radio2","check1","check2","hidden1","hidden2","name"] );
+ * t( "Disabled UI Element", "input:disabled", ["text2"] );
+ * t( "Checked UI Element", "input:checked", ["radio2","check1"] );
+ * t( "Selected Option Element", "option:selected", ["option1a","option2d","option3b","option3c"] );
+ * t( "Text Contains", "a:contains('Google')", ["google","groups"] );
+ * t( "Text Contains", "a:contains('Google Groups')", ["groups"] );
+ * t( "Element Preceded By", "p ~ div", ["foo"] );
+ * t( "Not", "a.blog:not(.link)", ["mark"] );
+ *
+ * ok( jQuery.find("//*").length >= 30, "All Elements (//*)" );
+ * t( "All Div Elements", "//div", ["main","foo"] );
+ * t( "Absolute Path", "/html/body", ["body"] );
+ * t( "Absolute Path w/ *", "/* /body", ["body"] );
+ * t( "Long Absolute Path", "/html/body/dl/div/div/p", ["sndp","en","sap"] );
+ * t( "Absolute and Relative Paths", "/html//div", ["main","foo"] );
+ * t( "All Children, Explicit", "//code/*", ["anchor1","anchor2"] );
+ * t( "All Children, Implicit", "//code/", ["anchor1","anchor2"] );
+ * t( "Attribute Exists", "//a[@title]", ["google"] );
+ * t( "Attribute Equals", "//a[@rel='bookmark']", ["simon1"] );
+ * t( "Parent Axis", "//p/..", ["main","foo"] );
+ * t( "Sibling Axis", "//p/../", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
+ * t( "Sibling Axis", "//p/../*", ["firstp","ap","foo","first","firstUL","empty","form","sndp","en","sap"] );
+ * t( "Has Children", "//p[a]", ["firstp","ap","en","sap"] );
+ *
+ * t( "nth Element", "p:nth(1)", ["ap"] );
+ * t( "First Element", "p:first", ["firstp"] );
+ * t( "Last Element", "p:last", ["first"] );
+ * t( "Even Elements", "p:even", ["firstp","sndp","sap"] );
+ * t( "Odd Elements", "p:odd", ["ap","en","first"] );
+ * t( "Position Equals", "p:eq(1)", ["ap"] );
+ * t( "Position Greater Than", "p:gt(0)", ["ap","sndp","en","sap","first"] );
+ * t( "Position Less Than", "p:lt(3)", ["firstp","ap","sndp"] );
+ * t( "Is A Parent", "p:parent", ["firstp","ap","sndp","en","sap","first"] );
+ * t( "Is Visible", "input:visible", ["text1","text2","radio1","radio2","check1","check2","name"] );
+ * t( "Is Hidden", "input:hidden", ["hidden1","hidden2"] );
+ *
+ * t( "Grouped Form Elements", "input[@name='foo[bar]']", ["hidden2"] );
+ *
+ * t( "All Children of ID", "#foo/*", ["sndp", "en", "sap"] );
+ * t( "All Children of ID with no children", "#firstUL/*", [] );
+ *
+ * t( "Form element :input", ":input", ["text1", "text2", "radio1", "radio2", "check1", "check2", "hidden1", "hidden2", "name", "button", "area1", "select1", "select2", "select3"] );
+ * t( "Form element :radio", ":radio", ["radio1", "radio2"] );
+ * t( "Form element :checkbox", ":checkbox", ["check1", "check2"] );
+ * t( "Form element :text", ":text", ["text1", "text2", "hidden2", "name"] );
+ * t( "Form element :radio:checked", ":radio:checked", ["radio2"] );
+ * t( "Form element :checkbox:checked", ":checkbox:checked", ["check1"] );
+ * t( "Form element :checkbox:checked, :radio:checked", ":checkbox:checked, :radio:checked", ["check1", "radio2"] );
+ *
+ * t( ":not() Existing attribute", "select:not([@multiple])", ["select1", "select2"]);
+ * t( ":not() Equals attribute", "select:not([@name=select1])", ["select2", "select3"]);
+ * t( ":not() Equals quoted attribute", "select:not([@name='select1'])", ["select2", "select3"]);
*
* @name $.find
* @type Array
@@ -1810,20 +1875,40 @@ jQuery.extend({
var fix = {
"for": "htmlFor",
"class": "className",
- "float": "cssFloat",
+ "float": jQuery.browser.msie ? "styleFloat" : "cssFloat",
+ cssFloat: jQuery.browser.msie ? "styleFloat" : "cssFloat",
innerHTML: "innerHTML",
className: "className",
value: "value",
disabled: "disabled",
- checked: "checked"
+ checked: "checked",
+ readonly: "readOnly"
};
+
+ // IE actually uses filters for opacity ... elem is actually elem.style
+ if (name == "opacity" && jQuery.browser.msie && value != undefined) {
+ // IE has trouble with opacity if it does not have layout
+ // Would prefer to check element.hasLayout first but don't have access to the element here
+ elem['zoom'] = 1;
+ if (value == 1) // Remove filter to avoid more IE weirdness
+ return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,"");
+ else
+ return elem["filter"] = elem["filter"].replace(/alpha\([^\)]*\)/gi,"") + "alpha(opacity=" + value * 100 + ")";
+ } else if (name == "opacity" && jQuery.browser.msie) {
+ return elem["filter"] ? parseFloat( elem["filter"].match(/alpha\(opacity=(.*)\)/)[1] )/100 : 1;
+ }
+
+ // Mozilla doesn't play well with opacity 1
+ if (name == "opacity" && jQuery.browser.mozilla && value == 1) value = 0.9999;
if ( fix[name] ) {
if ( value != undefined ) elem[fix[name]] = value;
return elem[fix[name]];
- } else if ( elem.getAttribute != undefined ) {
+ } else if( value == undefined && jQuery.browser.msie && elem.nodeName && elem.nodeName.toUpperCase() == 'FORM' && (name == 'action' || name == 'method') ) {
+ return elem.getAttributeNode(name).nodeValue;
+ } else if ( elem.getAttribute != undefined && elem.tagName ) { // IE elem.getAttribute passes even for style
if ( value != undefined ) elem.setAttribute( name, value );
- return elem.getAttribute( name, 2 );
+ return elem.getAttribute( name );
} else {
name = name.replace(/-([a-z])/ig,function(z,b){return b.toUpperCase();});
if ( value != undefined ) elem[name] = value;
@@ -1834,13 +1919,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"
@@ -1856,28 +1941,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, "" );
@@ -1885,7 +1961,7 @@ jQuery.extend({
}
}
- // :not() is a special case that can be optomized by
+ // :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,false).r;
@@ -2193,12 +2269,12 @@ jQuery.extend({
},
handle: function(event) {
- if ( typeof jQuery == "undefined" ) return;
+ if ( typeof jQuery == "undefined" ) return false;
event = event || jQuery.event.fix( window.event );
// If no correct event was found, fail
- if ( !event ) return;
+ if ( !event ) return false;
var returnValue = true;
@@ -2219,22 +2295,50 @@ jQuery.extend({
},
fix: function(event) {
- if ( event ) {
+ // check IE
+ if(jQuery.browser.msie) {
+ // get real event from window.event
+ event = window.event;
event.preventDefault = function() {
this.returnValue = false;
};
-
event.stopPropagation = function() {
this.cancelBubble = true;
};
+ // fix target property
+ event.target = event.srcElement;
+ // check safari and if target is a textnode
+ } else if(jQuery.browser.safari && event.target.nodeType == 3) {
+ // target is readonly, clone the event object
+ event = jQuery.extend({}, event);
+ // get parentnode from textnode
+ event.target = event.target.parentNode;
}
-
return event;
}
}
});
+/**
+ * Contains flags for the useragent, read from navigator.userAgent.
+ * Available flags are: safari, opera, msie, mozilla
+ * This property is available before the DOM is ready, therefore you can
+ * use it to add ready events only for certain browsers.
+ *
+ * See
+ * jQBrowser plugin for advanced browser detection:
+ *
+ * @example $.browser.msie
+ * @desc returns true if the current useragent is some version of microsoft's internet explorer
+ *
+ * @example if($.browser.safari) { $( function() { alert("this is safari!"); } ); }
+ * @desc Alerts "this is safari!" only for safari browsers
+ *
+ * @name $.browser
+ * @type Boolean
+ * @cat Javascript
+ */
new function() {
var b = navigator.userAgent.toLowerCase();
@@ -2625,7 +2729,7 @@ jQuery.macros = {
* @result "some text"
*
* @test ok( $("#text1").val() == "Test", "Check for value of input element" );
- * @test ok( !$("#text1").val() == "", "Check for value of input element" );
+ * ok( !$("#text1").val() == "", "Check for value of input element" );
*
* @name val
* @type String
@@ -2635,7 +2739,7 @@ jQuery.macros = {
/**
* Set the value of every matched element.
*
- * @example $("input").value("test");
+ * @example $("input").val("test");
* @before
* @result
*
@@ -2693,8 +2797,8 @@ jQuery.macros = {
* @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" );
+ * ok( $("#foo").id() == "foo", "Check for id" );
+ * ok( !$("head").id(), "Check for id" );
*
* @name id
* @type String
@@ -2723,7 +2827,7 @@ jQuery.macros = {
* @result "my image"
*
* @test ok( $(document.getElementById('google')).title() == "Google!", "Check for title" );
- * @test ok( !$("#yahoo").title(), "Check for title" );
+ * ok( !$("#yahoo").title(), "Check for title" );
*
* @name title
* @type String
@@ -2752,8 +2856,8 @@ jQuery.macros = {
* @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" );
+ * ok( $("#hidden1").name() == "hidden", "Check for name" );
+ * ok( !$("#area1").name(), "Check for name" );
*
* @name name
* @type String
@@ -2976,7 +3080,7 @@ jQuery.macros = {
*
* It only returns the immediately previous sibling, not all previous siblings.
*
- * @example $("p").previous()
+ * @example $("p").prev()
* @before