Merge pull request #83 from XhmikosR/master

Update test/index.html
This commit is contained in:
Brandon Aaron
2013-11-18 09:39:54 -08:00
+27 -35
View File
@@ -4,60 +4,43 @@
<meta charset="iso-8859-1">
<title>Testing mousewheel plugin</title>
<script>
(function() {
var verMatch = /v=([\w\.]+)/.exec(location.search),
version = verMatch && verMatch[1],
src;
if (version)
src = 'code.jquery.com/jquery-' + version;
else
src = 'code.jquery.com/jquery-git';
document.write('<script src="http://' + src + '.js"><\/script>');
})();
</script>
<script src="../jquery.mousewheel.js"></script>
<style>
html {
font: 13px Arial, sans-serif;
}
#stage {
color: #fff;
position: relative;
zoom: 1;
}
#test1, #test2, #test3, #test4, #test5, #test6, #test7 {
float: left;
}
#test1 {
background-color: #000;
width: 120px;
height: 100px;
color: #fff;
float: left;
}
#test2 {
background-color: #333;
width: 120px;
height: 100px;
color: #fff;
float: left;
}
#test3 {
background-color: #666;
width: 120px;
height: 100px;
color: #fff;
float: left;
}
#test4 {
background-color: #000;
width: 120px;
height: 100px;
color: #fff;
float: left;
}
#test5 {
@@ -65,8 +48,6 @@
padding: 5px;
width: 400px;
height: 400px;
color: #fff;
float: left;
}
#test6 {
@@ -74,8 +55,6 @@
padding: 5px;
width: 250px;
height: 250px;
color: #fff;
float: left;
}
#test7 {
@@ -83,8 +62,6 @@
padding: 5px;
width: 100px;
height: 100px;
color: #fff;
float: left;
}
#forceScroll {
@@ -103,6 +80,7 @@
}
#logger p {
color: #000;
padding: 2px;
border-bottom: 1px solid #ccc;
margin: 0;
@@ -116,6 +94,19 @@
border-bottom-color: #000;
}
</style>
<script>
(function() {
var verMatch = /v=([\w\.]+)/.exec(location.search),
version = verMatch && verMatch[1],
src;
if (version)
src = 'code.jquery.com/jquery-' + version;
else
src = 'code.jquery.com/jquery-git';
document.write('<script src="http://' + src + '.js"><\/script>');
})();
</script>
<script>
$(function() {
$('#userAgent').html(navigator.userAgent);
@@ -147,13 +138,13 @@
};
$('#test1')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
log('pageX: ' + event.pageX + ' pageY: ' + event.pageY );
});
$('#test2')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
return false; // prevent default
});
@@ -170,33 +161,33 @@
};
$('#test4')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
return false;
})
.mousewheel(testRemoval)
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
return false;
})
.unmousewheel(testRemoval);
$('#test5')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
event.stopPropagation();
event.preventDefault();
});
$('#test6')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
event.stopPropagation();
event.preventDefault();
});
$('#test7')
.mousewheel(function(event, delta, deltaX, deltaY) {
.mousewheel(function(event, delta) {
loghandle(event, delta);
event.preventDefault();
});
@@ -206,6 +197,7 @@
}
});
</script>
<script src="../jquery.mousewheel.js"></script>
</head>
<body>
<h1 id="banner">jQuery mousewheel.js Test with jQuery <span id="jqueryVersion"></span></h1>