X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=b9cb311ea29306281e26d897c687edc7a60177bf;hb=facb2324f9b5db4f4e20f529cb12952daad20aff;hp=66588f51d0cea90acc8d5d0533cdc54ec58f4b3f;hpb=e3828d1a483527ecf70944044134f09196011d66;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 66588f5..b9cb311 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -1,7 +1,9 @@ /* - * JQuery (http://jquery.com/) - * By John Resig (http://ejohn.org/) - * Under an Attribution, Share Alike License + * jQuery (jquery.com) + * + * Copyright (c) 2006 John Resig (ejohn.org) + * Licensed under the MIT License: + * http://www.opensource.org/licenses/mit-license.php * * $Date$ * $Rev$ @@ -67,13 +69,14 @@ function $(a,c) { }, css: function(a,b) { - return this.each(function(){ - if ( !b ) - for ( var j in a ) - $.attr(this.style,j,a[j]); - else - $.attr(this.style,a,b); - }); + return a.constructor != String || b ? + this.each(function(){ + if ( !b ) + for ( var j in a ) + $.attr(this.style,j,a[j]); + else + $.attr(this.style,a,b); + }) : $.css( this.get(0), a ); }, toggle: function() { return this.each(function(){ @@ -753,4 +756,4 @@ $.fn.text = function(e) { setTimeout(function(){ if ( typeof Prototype != "undefined" && $.g == null && $.clean == null ) throw "Error: You are overwriting jQuery, please include jQuery last."; -}, 1000); \ No newline at end of file +}, 1000);