Skip to content

Commit 866dd51

Browse files
brandonaaronbrandonaaron
committed
Clean up the test and be sure to support jQuery 1.2.2
1 parent adf892d commit 866dd51

File tree

1 file changed

+30
-132
lines changed

1 file changed

+30
-132
lines changed

‎test/index.html‎

Lines changed: 30 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -118,54 +118,40 @@
118118
$('#userAgent').html(navigator.userAgent);
119119
$('#jqueryVersion').html($.fn.jquery);
120120

121-
function addFactorInfo(event) {
122-
return ', deltaFactor(' + event.deltaFactor + ')';
123-
}
121+
var loghandle = function(event, delta) {
122+
var o = '', id = event.currentTarget.id;
124123

125-
$('#test1')
126-
.mousewheel(function(event, delta, deltaX, deltaY) {
127-
var o = '';
128-
if (delta > 0)
129-
o = '#test1: up ('+delta+')';
130-
else if (delta < 0)
131-
o = '#test1: down ('+delta+')';
124+
o = '#' + id + ':';
125+
126+
if (delta > 0)
127+
o = ' up (' + delta + ')';
128+
else if (delta < 0)
129+
o = ' down (' + delta + ')';
132130

133-
if (deltaX > 0)
134-
o = o + ', east ('+deltaX+')';
135-
else if (deltaX < 0)
136-
o = o + ', west ('+deltaX+')';
131+
if (event.deltaY > 0)
132+
o += ' north (' + event.deltaY + ')';
133+
else if (event.deltaY < 0)
134+
o += ' south (' + event.deltaY + ')';
137135

138-
if (deltaY > 0)
139-
o = o + ', north ('+deltaY+')';
140-
else if (deltaY < 0)
141-
o = o + ', south ('+deltaY+')';
136+
if (event.deltaX > 0)
137+
o += ' east (' + event.deltaX + ')';
138+
else if (event.deltaX < 0)
139+
o += ' south (' + event.deltaX + ')';
142140

143-
if( o != '' )
144-
log( o + addFactorInfo(event) );
141+
o += ' deltaFactor (' + event.deltaFactor + ')';
142+
143+
log( o );
144+
};
145145

146+
$('#test1')
147+
.mousewheel(function(event, delta, deltaX, deltaY) {
148+
loghandle(event, delta);
146149
log('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
147150
});
148151

149152
$('#test2')
150153
.mousewheel(function(event, delta, deltaX, deltaY) {
151-
var o = '';
152-
if (delta > 0)
153-
o = '#test2: up ('+delta+')';
154-
else if (delta < 0)
155-
o = '#test2: down ('+delta+')';
156-
157-
if (deltaX > 0)
158-
o = o + ', east ('+deltaX+')';
159-
else if (deltaX < 0)
160-
o = o + ', west ('+deltaX+')';
161-
162-
if (deltaY > 0)
163-
o = o + ', north ('+deltaY+')';
164-
else if (deltaY < 0)
165-
o = o + ', south ('+deltaY+')';
166-
167-
if( o != '' )
168-
log( o + addFactorInfo(event) );
154+
loghandle(event, delta);
169155
return false; // prevent default
170156
});
171157

@@ -182,126 +168,38 @@
182168

183169
$('#test4')
184170
.mousewheel(function(event, delta, deltaX, deltaY) {
185-
var o = '';
186-
if (delta > 0)
187-
o = '#test4: up ('+delta+')';
188-
else if (delta < 0)
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 + addFactorInfo(event) );
171+
loghandle(event, delta);
203172
return false;
204173
})
205174
.mousewheel(testRemoval)
206175
.mousewheel(function(event, delta, deltaX, deltaY) {
207-
var o = '';
208-
if (delta > 0)
209-
o = '#test4: up ('+delta+')';
210-
else if (delta < 0)
211-
o = '#test4: down ('+delta+')';
212-
213-
if (deltaX > 0)
214-
o = o + ', east ('+deltaX+')';
215-
else if (deltaX < 0)
216-
o = o + ', west ('+deltaX+')';
217-
218-
if (deltaY > 0)
219-
o = o + ', north ('+deltaY+')';
220-
else if (deltaY < 0)
221-
o = o + ', south ('+deltaY+')';
222-
223-
if( o != '' )
224-
log( o + addFactorInfo(event) + ' from 2nd handler' );
176+
loghandle(event, delta);
225177
return false;
226178
})
227179
.unmousewheel(testRemoval);
228180

229181
$('#test5')
230182
.mousewheel(function(event, delta, deltaX, deltaY) {
231-
var o = '';
232-
if (delta > 0)
233-
o = '#test5: up ('+delta+')';
234-
else if (delta < 0)
235-
o = '#test5: down ('+delta+')';
236-
237-
if (deltaX > 0)
238-
o = o + ', east ('+deltaX+')';
239-
else if (deltaX < 0)
240-
o = o + ', west ('+deltaX+')';
241-
242-
if (deltaY > 0)
243-
o = o + ', north ('+deltaY+')';
244-
else if (deltaY < 0)
245-
o = o + ', south ('+deltaY+')';
246-
247-
if( o != '' )
248-
log( o + addFactorInfo(event) );
249-
183+
loghandle(event, delta);
250184
event.stopPropagation();
251185
event.preventDefault();
252186
});
253187

254188
$('#test6')
255189
.mousewheel(function(event, delta, deltaX, deltaY) {
256-
var o = '';
257-
if (delta > 0)
258-
o = '#test6: up ('+delta+')';
259-
else if (delta < 0)
260-
o = '#test6: down ('+delta+')';
261-
262-
if (deltaX > 0)
263-
o = o + ', east ('+deltaX+')';
264-
else if (deltaX < 0)
265-
o = o + ', west ('+deltaX+')';
266-
267-
if (deltaY > 0)
268-
o = o + ', north ('+deltaY+')';
269-
else if (deltaY < 0)
270-
o = o + ', south ('+deltaY+')';
271-
272-
if( o != '' )
273-
log( o + addFactorInfo(event) );
274-
190+
loghandle(event, delta);
275191
event.stopPropagation();
276192
event.preventDefault();
277193
});
278194

279195
$('#test7')
280196
.mousewheel(function(event, delta, deltaX, deltaY) {
281-
var o = '';
282-
if (delta > 0)
283-
o = '#test7: up ('+delta+')';
284-
else if (delta < 0)
285-
o = '#test7: down ('+delta+')';
286-
287-
if (deltaX > 0)
288-
o = o + ', east ('+deltaX+')';
289-
else if (deltaX < 0)
290-
o = o + ', west ('+deltaX+')';
291-
292-
if (deltaY > 0)
293-
o = o + ', north ('+deltaY+')';
294-
else if (deltaY < 0)
295-
o = o + ', south ('+deltaY+')';
296-
297-
if( o != '' )
298-
log( o + addFactorInfo(event) );
299-
197+
loghandle(event, delta);
300198
event.preventDefault();
301199
});
302200

303201
function log(msg) {
304-
$('#logger').append('<p>'+msg+'<\/p>').scrollTop(999999);
202+
$('#logger').append('<p>'+msg+'<\/p>')[0].scrollTop = 999999;
305203
};
306204
});
307205
</script>

0 commit comments

Comments
 (0)