X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=jquery%2Fjquery.js;h=f987c86d20e6714f5035094a9eff8af7adb51099;hb=29a059142123a8bde16de2e579e7708a86a8de78;hp=7fd11462a683e7baa71fab228ee49407abaf9940;hpb=954554e2390772fda9a27fdd0c651b5ad76bca16;p=jquery.git diff --git a/jquery/jquery.js b/jquery/jquery.js index 7fd1146..f987c86 100644 --- a/jquery/jquery.js +++ b/jquery/jquery.js @@ -62,7 +62,7 @@ function jQuery(a,c) { // Watch for when an array is passed in this.get( a.constructor == Array || a.length && a[0] != undefined && a[0].nodeType ? - // Assume that it's an array of DOM Elements + // Assume that it is an array of DOM Elements jQuery.merge( a, [] ) : // Find the matching elements and save them for later @@ -1181,10 +1181,10 @@ jQuery.extend({ return jQuery.curCSS( e, p ); }, - curCSS: function(e,p) { + curCSS: function(e,p,force) { var r; - if (e.style[p]) + if (!force && e.style[p]) r = e.style[p]; else if (e.currentStyle) r = e.currentStyle[p];