X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=e12245c05616bd63af54e03f4f5313e1de0319b8;hb=68313e77488d98d7419e87c7090d4ec9b9d4882b;hp=9edd75865a43afdf519fa94e0f72271c9ac60ef3;hpb=96d429b940be462d5908d9a79fbcb2717f9211e5;p=jquery.git
diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 9edd758..e12245c 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -15,23 +15,15 @@ window.undefined = window.undefined;
/**
* Create a new jQuery Object
*
- * @test ok( Array.prototype.push, "Array.push()" );
- * 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 && typeof a == "function" && jQuery.fn.ready )
+ if ( a && typeof a == "function" && jQuery.fn.ready && !a.nodeType && a[0] == undefined ) // Safari reports typeof on DOM NodeLists as a function
return jQuery(document).ready(a);
// Make sure that a selection was provided
@@ -50,30 +42,35 @@ jQuery = function(a,c) {
return new jQuery(a,c);
// Handle HTML strings
- if ( a.constructor == String ) {
+ if ( typeof a == "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 ?
+ this.get( a.constructor == Array || a.length && a != window && !a.nodeType && a[0] != undefined && a[0].nodeType ?
// Assume that it is an array of DOM Elements
jQuery.merge( a, [] ) :
// 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 && typeof fn == "function" )
this.each(fn);
+
+ return this;
};
// Map over the $ in case of overwrite
if ( typeof $ != "undefined" )
jQuery._$ = $;
+
+// Map the jQuery namespace to the '$' one
+var $ = jQuery;
/**
* This function accepts a string containing a CSS selector,
@@ -187,9 +184,6 @@ if ( typeof $ != "undefined" )
* @type jQuery
*/
-// Map the jQuery namespace to the '$' one
-var $ = jQuery;
-
jQuery.fn = jQuery.prototype = {
/**
* The current version of jQuery.
@@ -209,8 +203,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").length == 2, "Get Number of Elements Found" );
- *
* @property
* @name length
* @type Number
@@ -224,8 +216,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result 2
*
- * @test ok( $("div").size() == 2, "Get Number of Elements Found" );
- *
* @name size
* @type Number
* @cat Core
@@ -243,8 +233,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test isSet( $("div").get(), q("main","foo"), "Get All Elements" );
- *
* @name get
* @type Array
* @cat Core
@@ -258,8 +246,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result [ ]
*
- * @test ok( $("div").get(0) == document.getElementById("main"), "Get A Single Element" );
- *
* @name get
* @type Element
* @param Number num Access the element in the Nth position.
@@ -320,14 +306,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var div = $("div");
- * div.each(function(){this.foo = 'zoo';});
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).foo != "zoo" ) pass = false;
- * }
- * ok( pass, "Execute a function, Relative" );
- *
* @name each
* @type jQuery
* @param Function fn A function to execute
@@ -354,16 +332,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result -1
*
- * @test ok( $([window, document]).index(window) == 0, "Check for index of elements" );
- * 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
* @param Object obj Object to search for
@@ -386,19 +354,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result test.jpg
*
- * @test ok( $('#text1').attr('value') == "Test", 'Check for value 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.
@@ -414,12 +369,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var pass = true;
- * $("div").attr({foo: 'baz', zoo: 'ping'}).each(function(){
- * if ( this.getAttribute('foo') != "baz" && this.getAttribute('zoo') != "ping" ) pass = false;
- * });
- * ok( pass, "Set Multiple Attributes" );
- *
* @name attr
* @type jQuery
* @param Hash prop A set of key/value pairs to set as object properties.
@@ -433,32 +382,6 @@ jQuery.fn = jQuery.prototype = {
* @before
* @result
*
- * @test var div = $("div");
- * div.attr("foo", "bar");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).getAttribute('foo') != "bar" ) pass = false;
- * }
- * 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' );
- *
- * @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
* @param String key The name of the property to set.
@@ -510,8 +433,6 @@ jQuery.fn = jQuery.prototype = {
* 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
* @param String name The name of the property to access.
@@ -527,12 +448,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css({display: 'none'});
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css({display: 'block'});
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param Hash prop A set of key/value pairs to set as style properties.
@@ -547,13 +462,6 @@ jQuery.fn = jQuery.prototype = {
* @result
Test Paragraph.
* @desc Changes the color of all paragraphs to red
*
- *
- * @test ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible');
- * $('#foo').css('display', 'none');
- * ok( !$('#foo').is(':visible'), 'Modified CSS display: Assert element is hidden');
- * $('#foo').css('display', 'block');
- * ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible');
- *
* @name css
* @type jQuery
* @param String key The name of the property to set.
@@ -573,9 +481,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result Test Paragraph.
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's Weblog";
- * ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' );
- *
* @name text
* @type String
* @cat DOM
@@ -611,11 +516,6 @@ jQuery.fn = jQuery.prototype = {
* @before
Test Paragraph.
* @result
Test Paragraph.
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').wrap('
').text();
- * 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
* @param String html A string of HTML, that will be created on the fly and wrapped around the target.
@@ -639,11 +539,6 @@ jQuery.fn = jQuery.prototype = {
* @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
* @param Element elem A DOM element that will be wrapped.
@@ -680,10 +575,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
I would like to say: Hello
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').append('buga');
- * ok( result.text() == defaultText + 'buga', 'Check if text appending works' );
- *
* @name append
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -699,10 +590,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:";
- * $('#sap').append(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for appending of element" );
- *
* @name append
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -718,10 +605,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
I would like to say: Hello
*
- * @test var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo";
- * $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for appending of array of elements" );
- *
* @name append
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -743,10 +626,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
HelloI would like to say:
*
- * @test var defaultText = 'Try them out:'
- * var result = $('#first').prepend('buga');
- * ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' );
- *
* @name prepend
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -762,10 +641,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
*
- * @test var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend(document.getElementById('first'));
- * ok( expected == $('#sap').text(), "Check for prepending of element" );
- *
* @name prepend
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -781,10 +656,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result
HelloI would like to say:
*
- * @test var expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog";
- * $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]);
- * ok( expected == $('#sap').text(), "Check for prepending of array of elements" );
- *
* @name prepend
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -804,10 +675,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result Hello
I would like to say:
*
- * @test var expected = 'This is a normal link: bugaYahoo';
- * $('#yahoo').before('buga');
- * ok( expected == $('#en').text(), 'Insert String before' );
- *
* @name before
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -821,10 +688,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
*
- * @test var expected = "This is a normal link: Try them out:Yahoo";
- * $('#yahoo').before(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element before" );
- *
* @name before
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -838,10 +701,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
Hello
* @result Hello
I would like to say:
*
- * @test var expected = "This is a normal link: Try them out:diveintomarkYahoo";
- * $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements before" );
- *
* @name before
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -861,10 +720,6 @@ jQuery.fn = jQuery.prototype = {
* @before
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = 'This is a normal link: Yahoobuga';
- * $('#yahoo').after('buga');
- * ok( expected == $('#en').text(), 'Insert String after' );
- *
* @name after
* @type jQuery
* @param String html A string of HTML, that will be created on the fly and appended to the target.
@@ -878,10 +733,6 @@ jQuery.fn = jQuery.prototype = {
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = "This is a normal link: YahooTry them out:";
- * $('#yahoo').after(document.getElementById('first'));
- * ok( expected == $('#en').text(), "Insert element after" );
- *
* @name after
* @type jQuery
* @param Element elem A DOM element that will be appended.
@@ -895,10 +746,6 @@ jQuery.fn = jQuery.prototype = {
* @before Hello
I would like to say:
* @result
I would like to say:
Hello
*
- * @test var expected = "This is a normal link: YahooTry them out:diveintomark";
- * $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]);
- * ok( expected == $('#en').text(), "Insert array of elements after" );
- *
* @name after
* @type jQuery
* @param Array elems An array of elements, all of which will be appended.
@@ -919,13 +766,13 @@ jQuery.fn = jQuery.prototype = {
* @before
]
*
- * @test var div = $("div");
- * div.addClass("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * if ( div.get(i).className.indexOf("test") == -1 ) pass = false;
- * }
- * ok( pass, "Add Class" );
- *
* @name addClass
* @type jQuery
* @param String class A CSS class to add to the elements
@@ -3241,24 +2909,6 @@ jQuery.macros = {
* @before
Hello
* @result [
Hello
]
*
- * @test var div = $("div").addClass("test");
- * div.removeClass("test");
- * var pass = true;
- * for ( var i = 0; i < div.size(); i++ ) {
- * 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
* @param String class A CSS class to remove from the elements
@@ -3269,8 +2919,8 @@ jQuery.macros = {
},
/**
- * Adds the specified class if it is present, removes it if it is
- * not present.
+ * Adds the specified class if it is not present, removes it if it is
+ * present.
*
* @example $("p").toggleClass("selected")
* @before