Skip to content

Commit 59a6b43

Browse files
Seamus Leahybrandonaaron
Seamus Leahy
authored and
brandonaaron
committed
Updating tests with deltaX and deltaY
1 parent 3b4d81a commit 59a6b43

File tree

1 file changed

+143
-29
lines changed

1 file changed

+143
-29
lines changed

‎test/index.html‎

Lines changed: 143 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,31 @@
88
<style>
99
#test1 {
1010
background-color: #000;
11-
width: 100px;
11+
width: 120px;
1212
height: 100px;
1313
color: #fff;
1414
float: left;
1515
}
1616

1717
#test2 {
1818
background-color: #333;
19-
width: 100px;
19+
width: 120px;
2020
height: 100px;
2121
color: #fff;
2222
float: left;
2323
}
2424

2525
#test3 {
2626
background-color: #666;
27-
width: 100px;
27+
width: 120px;
2828
height: 100px;
2929
color: #fff;
3030
float: left;
3131
}
3232

3333
#test4 {
3434
background-color: #000;
35-
width: 100px;
35+
width: 120px;
3636
height: 100px;
3737
color: #fff;
3838
float: left;
@@ -74,98 +74,212 @@
7474
position: absolute;
7575
top: 395px;
7676
left: 12px;
77-
width: 380px;
77+
width: 460px;
7878
height: 290px;
7979
overflow: auto;
8080
}
81+
82+
#logger p {
83+
font-family: Arial, sans-serif;
84+
font-size: 13px;
85+
padding: 2px;
86+
border-bottom: 1px solid #ccc;
87+
margin: 0;
88+
}
89+
90+
#logger p:nth-child(even) {
91+
background-color: #FFFFE8;
92+
}
93+
94+
#logger p:nth-child(10n) {
95+
border-bottom-color: #000;
96+
}
8197
</style>
8298
<script type="text/javascript">
8399
$(function() {
84100
$('#userAgent').html(navigator.userAgent);
85101

86102

87103
$('#test1')
88-
.mousewheel(function(event, delta) {
104+
.mousewheel(function(event, delta, deltaX, deltaY) {
105+
var o = '';
89106
if (delta > 0)
90-
log('#test1: up ('+delta+')');
107+
o = '#test1: up ('+delta+')';
91108
else if (delta < 0)
92-
log('#test1: down ('+delta+')');
109+
o = '#test1: down ('+delta+')';
110+
111+
if (deltaX > 0)
112+
o = o + ', east ('+deltaX+')';
113+
else if (deltaX < 0)
114+
o = o + ', west ('+deltaX+')';
115+
116+
if (deltaY > 0)
117+
o = o + ', north ('+deltaY+')';
118+
else if (deltaY < 0)
119+
o = o + ', south ('+deltaY+')';
120+
121+
if( o != '' )
122+
log( o );
93123

94124
log('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
95125
});
96126

97127
$('#test2')
98-
.mousewheel(function(event, delta) {
128+
.mousewheel(function(event, delta, deltaX, deltaY) {
129+
var o = '';
99130
if (delta > 0)
100-
log('#test2: up ('+delta+')');
131+
o = '#test2: up ('+delta+')';
101132
else if (delta < 0)
102-
log('#test2: down ('+delta+')');
133+
o = '#test2: down ('+delta+')';
134+
135+
if (deltaX > 0)
136+
o = o + ', east ('+deltaX+')';
137+
else if (deltaX < 0)
138+
o = o + ', west ('+deltaX+')';
139+
140+
if (deltaY > 0)
141+
o = o + ', north ('+deltaY+')';
142+
else if (deltaY < 0)
143+
o = o + ', south ('+deltaY+')';
144+
145+
if( o != '' )
146+
log( o );
103147
return false; // prevent default
104148
});
105149

106150
$('#test3')
107151
.hover(function() { log('#test3: mouseover'); }, function() { log('#test3: mouseout'); })
108-
.mousewheel(function(event, delta) {
152+
.mousewheel(function(event, delta, deltaX, deltaY) {
109153
log('#test3: I should not have been logged');
110154
})
111155
.unmousewheel();
112156

113-
var testRemoval = function(event, delta) {
157+
var testRemoval = function(event, delta, deltaX, deltaY) {
114158
log('#test4: I should not have been logged');
115159
};
116160

117161
$('#test4')
118-
.mousewheel(function(event, delta) {
162+
.mousewheel(function(event, delta, deltaX, deltaY) {
163+
var o = '';
119164
if (delta > 0)
120-
log('#test4: up ('+delta+')');
165+
o = '#test4: up ('+delta+')';
121166
else if (delta < 0)
122-
log('#test4: down ('+delta+')');
167+
o = '#test4: down ('+delta+')';
168+
169+
if (deltaX > 0)
170+
o = o + ', east ('+deltaX+')';
171+
else if (deltaX < 0)
172+
o = o + ', west ('+deltaX+')';
173+
174+
if (deltaY > 0)
175+
o = o + ', north ('+deltaY+')';
176+
else if (deltaY < 0)
177+
o = o + ', south ('+deltaY+')';
178+
179+
if( o != '' )
180+
log( o );
123181
return false;
124182
})
125183
.mousewheel(testRemoval)
126-
.mousewheel(function(event, delta) {
184+
.mousewheel(function(event, delta, deltaX, deltaY) {
185+
var o = '';
127186
if (delta > 0)
128-
log('#test4: up ('+delta+') from 2nd handler');
187+
o = '#test4: up ('+delta+')';
129188
else if (delta < 0)
130-
log('#test4: down ('+delta+') from 2nd handler');
189+
o = '#test4: down ('+delta+')';
190+
191+
if (deltaX > 0)
192+
o = o + ', east ('+deltaX+')';
193+
else if (deltaX < 0)
194+
o = o + ', west ('+deltaX+')';
195+
196+
if (deltaY > 0)
197+
o = o + ', north ('+deltaY+')';
198+
else if (deltaY < 0)
199+
o = o + ', south ('+deltaY+')';
200+
201+
if( o != '' )
202+
log( o + ' from 2nd handler' );
131203
return false;
132204
})
133205
.unmousewheel(testRemoval);
134206

135207
$('#test5')
136-
.mousewheel(function(event, delta) {
208+
.mousewheel(function(event, delta, deltaX, deltaY) {
209+
var o = '';
137210
if (delta > 0)
138-
log('#test5: up ('+delta+')');
211+
o = '#test5: up ('+delta+')';
139212
else if (delta < 0)
140-
log('#test5: down ('+delta+')');
213+
o = '#test5: down ('+delta+')';
214+
215+
if (deltaX > 0)
216+
o = o + ', east ('+deltaX+')';
217+
else if (deltaX < 0)
218+
o = o + ', west ('+deltaX+')';
219+
220+
if (deltaY > 0)
221+
o = o + ', north ('+deltaY+')';
222+
else if (deltaY < 0)
223+
o = o + ', south ('+deltaY+')';
224+
225+
if( o != '' )
226+
log( o );
141227

142228
event.stopPropagation();
143229
event.preventDefault();
144230
});
145231

146232
$('#test6')
147-
.mousewheel(function(event, delta) {
233+
.mousewheel(function(event, delta, deltaX, deltaY) {
234+
var o = '';
148235
if (delta > 0)
149-
log('#test6: up ('+delta+')');
236+
o = '#test6: up ('+delta+')';
150237
else if (delta < 0)
151-
log('#test6: down ('+delta+')');
238+
o = '#test6: down ('+delta+')';
239+
240+
if (deltaX > 0)
241+
o = o + ', east ('+deltaX+')';
242+
else if (deltaX < 0)
243+
o = o + ', west ('+deltaX+')';
244+
245+
if (deltaY > 0)
246+
o = o + ', north ('+deltaY+')';
247+
else if (deltaY < 0)
248+
o = o + ', south ('+deltaY+')';
249+
250+
if( o != '' )
251+
log( o );
152252

153253
event.stopPropagation();
154254
event.preventDefault();
155255
});
156256

157257
$('#test7')
158-
.mousewheel(function(event, delta) {
258+
.mousewheel(function(event, delta, deltaX, deltaY) {
259+
var o = '';
159260
if (delta > 0)
160-
log('#test7: up ('+delta+')');
261+
o = '#test7: up ('+delta+')';
161262
else if (delta < 0)
162-
log('#test7 down ('+delta+')');
263+
o = '#test7: down ('+delta+')';
264+
265+
if (deltaX > 0)
266+
o = o + ', east ('+deltaX+')';
267+
else if (deltaX < 0)
268+
o = o + ', west ('+deltaX+')';
269+
270+
if (deltaY > 0)
271+
o = o + ', north ('+deltaY+')';
272+
else if (deltaY < 0)
273+
o = o + ', south ('+deltaY+')';
274+
275+
if( o != '' )
276+
log( o );
163277

164278
event.preventDefault();
165279
});
166280

167281
function log(msg) {
168-
$('#logger').append(msg+'<br>').scrollTop(999999);
282+
$('#logger').append('<p>'+msg+'</p>').scrollTop(999999);
169283
};
170284
});
171285
</script>

0 commit comments

Comments
 (0)