Skip to content

Commit b6b3a70

Browse files
committed
Merge pull request #83 from XhmikosR/master
Update test/index.html
2 parents 7568a8e + 932c3c5 commit b6b3a70

File tree

1 file changed

+27
-35
lines changed

1 file changed

+27
-35
lines changed

test/index.html

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,64 @@
44
<meta charset="iso-8859-1">
55
<title>Testing mousewheel plugin</title>
66

7-
<script>
8-
(function() {
9-
var verMatch = /v=([\w\.]+)/.exec(location.search),
10-
version = verMatch && verMatch[1],
11-
src;
12-
if (version)
13-
src = 'code.jquery.com/jquery-' + version;
14-
else
15-
src = 'code.jquery.com/jquery-git';
16-
document.write('<script src="http://' + src + '.js"><\/script>');
17-
})();
18-
</script>
19-
<script src="../jquery.mousewheel.js"></script>
20-
217
<style>
228
html {
239
font: 13px Arial, sans-serif;
2410
}
2511

2612
#stage {
13+
color: #fff;
2714
position: relative;
2815
zoom: 1;
2916
}
3017

18+
#test1, #test2, #test3, #test4, #test5, #test6, #test7 {
19+
float: left;
20+
}
21+
3122
#test1 {
3223
background-color: #000;
3324
width: 120px;
3425
height: 100px;
35-
color: #fff;
36-
float: left;
3726
}
3827

3928
#test2 {
4029
background-color: #333;
4130
width: 120px;
4231
height: 100px;
43-
color: #fff;
44-
float: left;
4532
}
4633

4734
#test3 {
4835
background-color: #666;
4936
width: 120px;
5037
height: 100px;
51-
color: #fff;
52-
float: left;
5338
}
5439

5540
#test4 {
5641
background-color: #000;
5742
width: 120px;
5843
height: 100px;
59-
color: #fff;
60-
float: left;
6144
}
6245

6346
#test5 {
6447
background-color: #333;
6548
padding: 5px;
6649
width: 400px;
6750
height: 400px;
68-
color: #fff;
69-
float: left;
7051
}
7152

7253
#test6 {
7354
background-color: #666;
7455
padding: 5px;
7556
width: 250px;
7657
height: 250px;
77-
color: #fff;
78-
float: left;
7958
}
8059

8160
#test7 {
8261
background-color: #000;
8362
padding: 5px;
8463
width: 100px;
8564
height: 100px;
86-
color: #fff;
87-
float: left;
8865
}
8966

9067
#forceScroll {
@@ -103,6 +80,7 @@
10380
}
10481

10582
#logger p {
83+
color: #000;
10684
padding: 2px;
10785
border-bottom: 1px solid #ccc;
10886
margin: 0;
@@ -116,6 +94,19 @@
11694
border-bottom-color: #000;
11795
}
11896
</style>
97+
98+
<script>
99+
(function() {
100+
var verMatch = /v=([\w\.]+)/.exec(location.search),
101+
version = verMatch && verMatch[1],
102+
src;
103+
if (version)
104+
src = 'code.jquery.com/jquery-' + version;
105+
else
106+
src = 'code.jquery.com/jquery-git';
107+
document.write('<script src="http://' + src + '.js"><\/script>');
108+
})();
109+
</script>
119110
<script>
120111
$(function() {
121112
$('#userAgent').html(navigator.userAgent);
@@ -147,13 +138,13 @@
147138
};
148139

149140
$('#test1')
150-
.mousewheel(function(event, delta, deltaX, deltaY) {
141+
.mousewheel(function(event, delta) {
151142
loghandle(event, delta);
152143
log('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
153144
});
154145

155146
$('#test2')
156-
.mousewheel(function(event, delta, deltaX, deltaY) {
147+
.mousewheel(function(event, delta) {
157148
loghandle(event, delta);
158149
return false; // prevent default
159150
});
@@ -170,33 +161,33 @@
170161
};
171162

172163
$('#test4')
173-
.mousewheel(function(event, delta, deltaX, deltaY) {
164+
.mousewheel(function(event, delta) {
174165
loghandle(event, delta);
175166
return false;
176167
})
177168
.mousewheel(testRemoval)
178-
.mousewheel(function(event, delta, deltaX, deltaY) {
169+
.mousewheel(function(event, delta) {
179170
loghandle(event, delta);
180171
return false;
181172
})
182173
.unmousewheel(testRemoval);
183174

184175
$('#test5')
185-
.mousewheel(function(event, delta, deltaX, deltaY) {
176+
.mousewheel(function(event, delta) {
186177
loghandle(event, delta);
187178
event.stopPropagation();
188179
event.preventDefault();
189180
});
190181

191182
$('#test6')
192-
.mousewheel(function(event, delta, deltaX, deltaY) {
183+
.mousewheel(function(event, delta) {
193184
loghandle(event, delta);
194185
event.stopPropagation();
195186
event.preventDefault();
196187
});
197188

198189
$('#test7')
199-
.mousewheel(function(event, delta, deltaX, deltaY) {
190+
.mousewheel(function(event, delta) {
200191
loghandle(event, delta);
201192
event.preventDefault();
202193
});
@@ -206,6 +197,7 @@
206197
}
207198
});
208199
</script>
200+
<script src="../jquery.mousewheel.js"></script>
209201
</head>
210202
<body>
211203
<h1 id="banner">jQuery mousewheel.js Test with jQuery <span id="jqueryVersion"></span></h1>

0 commit comments

Comments
 (0)