]> source.dussan.org Git - jquery.git/commitdiff
projects / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 02ca455)
Moved jQuery global leak to end of file so accidental gEBCN overrides in prototype... 204/head
authorAlex Sexton <AlexSexton@gmail.com>
Mon, 24 Jan 2011 03:19:33 +0000 (21:19 -0600)
committerAlex Sexton <AlexSexton@gmail.com>
Mon, 24 Jan 2011 03:19:33 +0000 (21:19 -0600)
src/core.js patch | blob | history
src/outro.js patch | blob | history
test/data/offset/absolute.html patch | blob | history
test/data/offset/body.html patch | blob | history
test/data/offset/fixed.html patch | blob | history
test/data/offset/relative.html patch | blob | history
test/data/offset/scroll.html patch | blob | history
test/data/offset/static.html patch | blob | history
test/data/offset/table.html patch | blob | history

diff --git a/src/core.js b/src/core.js
index 520db45ed6cc179ba99b40d57725e3abe17ddcd9..92ebb13ef7414ebb67f0c65181cc1c993ce110e5 100644 (file)
--- 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 7773a74fdc1e816f1b54fd011a5d6ac454e05dd6..32b0d08783902f54c6e7dbf1d9a7302426cdbe79 100644 (file)
--- 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 dc0ba22f228e2d1a42dc1f746519edb29ee93753..b4db30a6cfff74db5d49935bda7c6c25856125f3 100644 (file)
--- a/test/data/offset/absolute.html
+++ b/test/data/offset/absolute.html
@@ -26,7 +26,7 @@
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" src="../../../dist/jquery.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                $('.absolute').click(function() {
                                        $('#marker').css( $(this).offset() );
                                        var pos = $(this).position();
diff --git a/test/data/offset/body.html b/test/data/offset/body.html
index 9a692e8009280cb09581888ba9cafa86558e5471..e3eb4f809ca5226dfc5cb513cf5fde7b1b2aba29 100644 (file)
--- a/test/data/offset/body.html
+++ b/test/data/offset/body.html
@@ -18,7 +18,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                $('body').click(function() {
                                        $('#marker').css( $(this).offset() );
                                        return false;
@@ -29,4 +29,4 @@
        <body>
                <div id="marker"></div>
        </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
index f795e5c99d84df138e2e3104b070b72208c3074f..f93c20ffd82036283e53dc79d4af24f72df73e5e 100644 (file)
--- a/test/data/offset/fixed.html
+++ b/test/data/offset/fixed.html
@@ -22,7 +22,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                window.scrollTo(1000,1000);
                                $('.fixed').click(function() {
                                        $('#marker').css( $(this).offset() );
@@ -38,4 +38,4 @@
                <div id="marker"></div>
                <p class="instructions">Click the white box to move the marker to it.</p>
        </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html
index bfcd147c3f3d10e3b8be2a6795830d08b144a6fd..35864760ed4ebe36a3a48dd6eae997d6f6e0907c 100644 (file)
--- a/test/data/offset/relative.html
+++ b/test/data/offset/relative.html
@@ -20,7 +20,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                $('.relative').click(function() {
                                        $('#marker').css( $(this).offset() );
                                        var pos = $(this).position();
@@ -36,4 +36,4 @@
                <div id="marker"></div>
                <p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p>
        </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/scroll.html b/test/data/offset/scroll.html
index e6980b4417b191d15f35d8319870981a572aad84..50de95e01acc0524a0440effb83f812143ae6994 100644 (file)
--- a/test/data/offset/scroll.html
+++ b/test/data/offset/scroll.html
@@ -23,7 +23,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                window.scrollTo(1000,1000);
                                $('#scroll-1')[0].scrollLeft = 5;
                                $('#scroll-1')[0].scrollTop = 5;
@@ -44,4 +44,4 @@
                <div id="marker"></div>
                <p class="instructions">Click the white box to move the marker to it.</p>
        </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/static.html b/test/data/offset/static.html
index f47a79b3944961415f5e9fc89b515d28efe87240..b1fb9f15872bc184c1687f4fef7ae5bb8a771ac3 100644 (file)
--- a/test/data/offset/static.html
+++ b/test/data/offset/static.html
@@ -20,7 +20,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                $('.static').click(function() {
                                        $('#marker').css( $(this).offset() );
                                        var pos = $(this).position();
@@ -36,4 +36,4 @@
                <div id="marker"></div>
                <p class="instructions">Click the white box to move the marker to it. Clicking the box also changes the position to absolute (if not already) and sets the position according to the position method.</p>
        </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/data/offset/table.html b/test/data/offset/table.html
index 83fb559f30c83a96c8a343f7585c36ee7c712e16..528e5303d140cd8beec1acf37fa8cbf46b0f7be7 100644 (file)
--- a/test/data/offset/table.html
+++ b/test/data/offset/table.html
@@ -20,7 +20,7 @@
                <script src="../../../src/css.js"></script>
                <script src="../../../src/offset.js"></script>
                <script type="text/javascript" charset="utf-8">
-                       $(function() {
+                       jQuery(function($) {
                                $('table, th, td').click(function() {
                                        $('#marker').css( $(this).offset() );
                                        return false;
@@ -48,4 +48,4 @@
                <div id="marker"></div>
                <p class="instructions">Click the white box to move the marker to it.</p>
        </body>
-</html>
\ No newline at end of file
+</html>
jQuery JavaScript Library: https://github.com/jquery/jquery