aboutsummaryrefslogtreecommitdiffstats
path: root/test/data
diff options
context:
space:
mode:
authorAlex Sexton <AlexSexton@gmail.com>2011-01-23 21:19:33 -0600
committerAlex Sexton <AlexSexton@gmail.com>2011-01-23 21:19:33 -0600
commitc50b74372c398b0c85164ad01977c5118b55d418 (patch)
treec14f176556b158ab665336247d36a0016116048c /test/data
parent02ca45573b8428f16e3eddb41f8fc50867bbda1b (diff)
downloadjquery-c50b74372c398b0c85164ad01977c5118b55d418.tar.gz
jquery-c50b74372c398b0c85164ad01977c5118b55d418.zip
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
Diffstat (limited to 'test/data')
-rw-r--r--test/data/offset/absolute.html2
-rw-r--r--test/data/offset/body.html4
-rw-r--r--test/data/offset/fixed.html4
-rw-r--r--test/data/offset/relative.html4
-rw-r--r--test/data/offset/scroll.html4
-rw-r--r--test/data/offset/static.html4
-rw-r--r--test/data/offset/table.html4
7 files changed, 13 insertions, 13 deletions
diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html
index dc0ba22f2..b4db30a6c 100644
--- 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 9a692e800..e3eb4f809 100644
--- 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 f795e5c99..f93c20ffd 100644
--- 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 bfcd147c3..35864760e 100644
--- 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 e6980b441..50de95e01 100644
--- 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 f47a79b39..b1fb9f158 100644
--- 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 83fb559f3..528e5303d 100644
--- 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>