X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=668a592d5892f1b77bda19b21b9ccf408290a86e;hb=40fdf0ad5c0dd13546a2a0925778605c5e7b1173;hp=563fc295f4958acb28025ff21a446060a929c908;hpb=f0034d64e3890553f214db0708b9a831476ea46a;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 563fc29..668a592 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -1,5 +1,5 @@ /* - * jQuery (http://jquery.com/) + * JQuery (http://jquery.com/) * By John Resig (http://ejohn.org/) * Under an Attribution, Share Alike License * @@ -67,13 +67,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(){ @@ -141,7 +142,7 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i in a ) + for ( var i = 0; i < a.length; i++ ) this.appendChild( clone ? a[i].cloneNode(true) : a[i] ); }); }, @@ -167,7 +168,7 @@ function $(a,c) { var clone = this.size() > 1; var a = $.clean(arguments); return this.each(function(){ - for ( var i in a ) + for ( var i = 0; i < a.length; i++ ) this.parentNode.insertBefore( clone ? a[i].cloneNode(true) : a[i], this ); }); }, @@ -383,7 +384,7 @@ $.g = { checked: "a.checked" }, // TODO: Write getAttribute helper - ".": "$.hasWord(a.className||a.getAttribute('class'),m[2])", + ".": "$.hasWord(a,m[2])", "@": { "=": "$.attr(a,m[3]) == m[4]", "!=": "$.attr(a,m[3]) != m[4]", @@ -697,9 +698,10 @@ function removeEvent(element, type, handler) { } }; -function triggerEvent(element,type) { - if ( element["on" + type] ) - element["on" + type]({ type: type }); +function triggerEvent(element,type,data) { + data = data || [{ type: type }]; + if ( element && element["on" + type] ) + $.apply( element, element["on" + type], data ); } function handleEvent(event) { @@ -752,4 +754,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); +}, 1000); \ No newline at end of file