Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,6 @@ grunt.initConfig( {

"requirejs/require.js": "requirejs/require.js",

"jquery-mousewheel/jquery.mousewheel.js": "jquery-mousewheel/jquery.mousewheel.js",
"jquery-mousewheel/LICENSE.txt": "jquery-mousewheel/LICENSE.txt",

"jquery-simulate/jquery.simulate.js": "jquery-simulate/jquery.simulate.js",
"jquery-simulate/LICENSE.txt": "jquery-simulate/LICENSE.txt",

Expand Down
1 change: 0 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
},
"devDependencies": {
"jquery-color": "3.0.0",
"jquery-mousewheel": "3.1.12",
"jquery-simulate": "1.1.1",
"qunit": "2.19.4",
"requirejs": "2.1.14",
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/currency.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../themes/base/all.css">
<link rel="stylesheet" href="../demos.css">
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE external/globalize/globalize.culture.ja-JP external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE external/globalize/globalize.culture.ja-JP">
$( "#currency" ).on( "change", function() {
$( "#spinner" ).spinner( "option", "culture", $( this ).val() );
});
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/decimal.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../themes/base/all.css">
<link rel="stylesheet" href="../demos.css">
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE external/globalize/globalize.culture.ja-JP external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE external/globalize/globalize.culture.ja-JP">
$( "#spinner" ).spinner({
step: 0.01,
numberFormat: "n"
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../themes/base/all.css">
<link rel="stylesheet" href="../demos.css">
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js">
var spinner = $( "#spinner" ).spinner();

$( "#disable" ).on( "click", function() {
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/latlong.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<link rel="stylesheet" href="../demos.css">
<script src="https://maps.google.com/maps/api/js?sensor=false"></script>
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js">
function latlong() {
return new google.maps.LatLng( $("#lat").val(), $("#lng").val() );
}
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/overflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../themes/base/all.css">
<link rel="stylesheet" href="../demos.css">
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js">
$( "#spinner" ).spinner({
spin: function( event, ui ) {
if ( ui.value > 10 ) {
Expand Down
2 changes: 1 addition & 1 deletion demos/spinner/time.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<link rel="stylesheet" href="../../themes/base/all.css">
<link rel="stylesheet" href="../demos.css">
<script src="../../external/requirejs/require.js"></script>
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE external/jquery-mousewheel/jquery.mousewheel">
<script src="../bootstrap.js" data-modules="external/globalize/globalize external/globalize/globalize.culture.de-DE">
$.widget( "ui.timespinner", $.ui.spinner, {
options: {
// seconds
Expand Down
20 changes: 0 additions & 20 deletions external/jquery-mousewheel/LICENSE.txt

This file was deleted.

221 changes: 0 additions & 221 deletions external/jquery-mousewheel/jquery.mousewheel.js

This file was deleted.

42 changes: 41 additions & 1 deletion tests/unit/spinner/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,47 @@ QUnit.test( "mouse click on up button, increases value not greater than max", fu
assert.equal( element.val(), 0 );
} );

QUnit.test( "mousewheel on input", function( assert ) {
QUnit.test( "wheel on input", function( assert ) {
var ready = assert.async();
assert.expect( 5 );

var element = $( "#spin" ).val( 0 ).spinner( {
step: 2
} );

element.simulate( "focus" );
setTimeout( step1 );

function getWheelEvent( deltaY ) {
return jQuery.Event( new WheelEvent( "wheel", { deltaY: deltaY } ) );
}

function step1() {
element.trigger( getWheelEvent() );
assert.equal( element.val(), 0, "wheel event without delta does not change value" );

element.trigger( getWheelEvent( -1 ) );
assert.equal( element.val(), 2, "delta -1" );

element.trigger( getWheelEvent( 0.2 ) );
assert.equal( element.val(), 0, "delta 0.2" );

element.trigger( getWheelEvent( 15 ) );
assert.equal( element.val(), -2, "delta 15" );

element.simulate( "blur" );
setTimeout( step2 );
}

function step2() {
element.trigger( "wheel", -1 );
assert.equal( element.val(), -2, "wheel when not focused" );

ready();
}
} );

QUnit.test( "mousewheel on input (DEPRECATED)", function( assert ) {
var ready = assert.async();
assert.expect( 5 );

Expand Down
Loading
Loading