Skip to content

Commit 942265b

Browse files
brandonaaronbrandonaaron
committed
clean up test page (a little)
1 parent 88f21a2 commit 942265b

File tree

2 files changed

+33
-3353
lines changed

2 files changed

+33
-3353
lines changed

‎test/index.html‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2-
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1+
<!doctype html>
32
<html>
43
<head>
54
<title>Testing mousewheel plugin</title>
6-
<link rel="Stylesheet" media="screen" href="../../../qunit/testsuite.css" />
7-
<script type="text/javascript" src="jquery.js"></script>
5+
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.js"></script>
86
<script type="text/javascript" src="../jquery.mousewheel.js"></script>
97

108
<style>
@@ -71,6 +69,15 @@
7169
clear: both;
7270
height: 1000px;
7371
}
72+
73+
#logger {
74+
position: absolute;
75+
top: 395px;
76+
left: 12px;
77+
width: 380px;
78+
height: 290px;
79+
overflow: auto;
80+
}
7481
</style>
7582
<script type="text/javascript">
7683
$(function() {
@@ -80,57 +87,57 @@
8087
$('#test1')
8188
.mousewheel(function(event, delta) {
8289
if (delta > 0)
83-
$('#logger').append('#test1: up ('+delta+')<br />');
90+
log('#test1: up ('+delta+')');
8491
else if (delta < 0)
85-
$('#logger').append('#test1: down ('+delta+')<br />');
92+
log('#test1: down ('+delta+')');
8693

87-
$('#logger').append('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
94+
log('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
8895
});
8996

9097
$('#test2')
9198
.mousewheel(function(event, delta) {
9299
if (delta > 0)
93-
$('#logger').append('#test2: up ('+delta+')<br />');
100+
log('#test2: up ('+delta+')');
94101
else if (delta < 0)
95-
$('#logger').append('#test2: down ('+delta+')<br />');
102+
log('#test2: down ('+delta+')');
96103
return false; // prevent default
97104
});
98105

99106
$('#test3')
100-
.hover(function() { $('#logger').append('#test3: mouseover'); }, function() { $('#logger').append('#test3: mouseout'); })
107+
.hover(function() { log('#test3: mouseover'); }, function() { log('#test3: mouseout'); })
101108
.mousewheel(function(event, delta) {
102-
$('#logger').append('#test3: I should not have been logged');
109+
log('#test3: I should not have been logged');
103110
})
104111
.unmousewheel();
105112

106113
var testRemoval = function(event, delta) {
107-
$('#logger').append('#test4: I should not have been logged');
114+
log('#test4: I should not have been logged');
108115
};
109116

110117
$('#test4')
111118
.mousewheel(function(event, delta) {
112119
if (delta > 0)
113-
$('#logger').append('#test4: up ('+delta+')<br />');
120+
log('#test4: up ('+delta+')');
114121
else if (delta < 0)
115-
$('#logger').append('#test4: down ('+delta+')<br />');
122+
log('#test4: down ('+delta+')');
116123
return false;
117124
})
118125
.mousewheel(testRemoval)
119126
.mousewheel(function(event, delta) {
120127
if (delta > 0)
121-
$('#logger').append('#test4: up ('+delta+') from 2nd handler');
128+
log('#test4: up ('+delta+') from 2nd handler');
122129
else if (delta < 0)
123-
$('#logger').append('#test4: down ('+delta+') from 2nd handler');
130+
log('#test4: down ('+delta+') from 2nd handler');
124131
return false;
125132
})
126133
.unmousewheel(testRemoval);
127134

128135
$('#test5')
129136
.mousewheel(function(event, delta) {
130137
if (delta > 0)
131-
$('#logger').append('#test5: up ('+delta+')<br />');
138+
log('#test5: up ('+delta+')');
132139
else if (delta < 0)
133-
$('#logger').append('#test5: down ('+delta+')<br />');
140+
log('#test5: down ('+delta+')');
134141

135142
event.stopPropagation();
136143
event.preventDefault();
@@ -139,9 +146,9 @@
139146
$('#test6')
140147
.mousewheel(function(event, delta) {
141148
if (delta > 0)
142-
$('#logger').append('#test6: up ('+delta+')<br />');
149+
log('#test6: up ('+delta+')');
143150
else if (delta < 0)
144-
$('#logger').append('#test6: down ('+delta+')<br />');
151+
log('#test6: down ('+delta+')');
145152

146153
event.stopPropagation();
147154
event.preventDefault();
@@ -150,12 +157,16 @@
150157
$('#test7')
151158
.mousewheel(function(event, delta) {
152159
if (delta > 0)
153-
$('#logger').append('#test7: up ('+delta+')<br />');
160+
log('#test7: up ('+delta+')');
154161
else if (delta < 0)
155-
$('#logger').append('#test7 down ('+delta+')<br />');
162+
log('#test7 down ('+delta+')');
156163

157164
event.preventDefault();
158165
});
166+
167+
function log(msg) {
168+
$('#logger').append(msg+'<br>');
169+
};
159170
});
160171
</script>
161172
</head>

0 commit comments

Comments
 (0)