X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=src%2Fjquery%2Fjquery.js;h=567e6a0fa807350b87d7d77859f79b7965e2c5a6;hb=83e98c28ef8aba11e525bf4266f8454232236ca0;hp=9965fd3497389042ecb6c25f8c705f9eb26ac56e;hpb=6de5a6b96a72f7b0b2cc54fa7df5410664b6e18b;p=jquery.git diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js index 9965fd3..567e6a0 100644 --- a/src/jquery/jquery.js +++ b/src/jquery/jquery.js @@ -28,10 +28,10 @@ window.undefined = window.undefined; * @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,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 && typeof fn == "function" ) this.each(fn); + + return this; }; // Map over the $ in case of overwrite @@ -445,6 +449,21 @@ jQuery.fn = jQuery.prototype = { * 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 @@ -519,6 +538,14 @@ jQuery.fn = jQuery.prototype = { * 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'); + * $('#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 @@ -540,6 +567,14 @@ jQuery.fn = jQuery.prototype = { * 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'); + * $('#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 @@ -670,6 +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' ); + * ok( $('#select3').append('').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element'); * * @name append * @type jQuery @@ -733,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 @@ -907,12 +944,15 @@ jQuery.fn = jQuery.prototype = { * @result $("p").find("span").end() == [
...
] * * @test ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' ); + * ok( $('#yahoo').end(), 'Check for end with nothing to end' ); * * @name end * @type jQuery * @cat DOM/Traversing */ end: function() { + if( !(this.stack && this.stack.length) ) + return this; return this.get( this.stack.pop() ); }, @@ -1018,6 +1058,7 @@ jQuery.fn = jQuery.prototype = { for ( var i = 0; i < t.length; i++ ) if ( jQuery.filter(t[i],[a]).r.length ) return a; + return false; }) || t.constructor == Boolean && @@ -1281,8 +1322,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; }; @@ -1374,7 +1424,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; }, @@ -1432,9 +1482,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" ) @@ -1476,6 +1528,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); @@ -1492,44 +1547,38 @@ jQuery.extend({ return ret; }, - + clean: function(a) { var r = []; for ( var i = 0; i < a.length; i++ ) { - if ( a[i].constructor == String ) { - // trim whitespace, otherwise indexOf won't work as expected - a[i] = jQuery.trim(a[i]); - - var table = ""; - - if ( !a[i].indexOf("" + a[i] + ""; - } else if ( !a[i].indexOf("Hello Again
And Again
* @result [