From c50b74372c398b0c85164ad01977c5118b55d418 Mon Sep 17 00:00:00 2001 From: Alex Sexton Date: Sun, 23 Jan 2011 21:19:33 -0600 Subject: [PATCH] Moved jQuery global leak to end of file so accidental gEBCN overrides in prototype don't get caught up in confusion. Fixed tests to reference jQuery variable instead of $ (best practice). Fixes #8033 --- src/core.js | 2 +- src/outro.js | 1 + test/data/offset/absolute.html | 2 +- test/data/offset/body.html | 4 ++-- test/data/offset/fixed.html | 4 ++-- test/data/offset/relative.html | 4 ++-- test/data/offset/scroll.html | 4 ++-- test/data/offset/static.html | 4 ++-- test/data/offset/table.html | 4 ++-- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/core.js b/src/core.js index 520db45e..92ebb13e 100644 --- a/src/core.js +++ b/src/core.js @@ -1054,6 +1054,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 7773a74f..32b0d087 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 dc0ba22f..b4db30a6 100644 --- a/test/data/offset/absolute.html +++ b/test/data/offset/absolute.html @@ -26,7 +26,7 @@