From: jeresig Date: Mon, 14 Feb 2011 17:35:27 +0000 (-0500) Subject: Merge branch 'fix8033' of https://github.com/SlexAxton/jquery into SlexAxton-fix8033 X-Git-Url: http://git.asbjorn.it/?a=commitdiff_plain;h=3ad8dd242acec1066f43a9349f4c1a352680d37b;hp=659773348f1fca0fb609f92271013f2a087f3247;p=jquery.git Merge branch 'fix8033' of https://github.com/SlexAxton/jquery into SlexAxton-fix8033 --- diff --git a/src/core.js b/src/core.js index 2e63472..1e1bd3e 100644 --- a/src/core.js +++ b/src/core.js @@ -1076,6 +1076,6 @@ function doScrollCheck() { } // Expose jQuery to the global object -return (window.jQuery = window.$ = jQuery); +return jQuery; })(); diff --git a/src/outro.js b/src/outro.js index 7773a74..32b0d08 100644 --- a/src/outro.js +++ b/src/outro.js @@ -1 +1,2 @@ +window.jQuery = window.$ = jQuery; })(window); diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html index dc0ba22..b4db30a 100644 --- a/test/data/offset/absolute.html +++ b/test/data/offset/absolute.html @@ -26,7 +26,7 @@