Skip to content

Commit 89bf0d0

Browse files
arschmitzarschmitz
committed
Spinner: Remove core event/alias and deprecated module dependencies
1 parent d157b59 commit 89bf0d0

File tree

8 files changed

+26
-26
lines changed

8 files changed

+26
-26
lines changed

‎demos/spinner/currency.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<link rel="stylesheet" href="../demos.css">
1717
<script>
1818
$(function() {
19-
$( "#currency" ).change(function() {
19+
$( "#currency" ).on( "change", function() {
2020
$( "#spinner" ).spinner( "option", "culture", $( this ).val() );
2121
});
2222

‎demos/spinner/decimal.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
numberFormat: "n"
2222
});
2323

24-
$( "#culture" ).change(function() {
24+
$( "#culture" ).on( "change", function() {
2525
var current = $( "#spinner" ).spinner( "value" );
2626
Globalize.culture( $(this).val() );
2727
$( "#spinner" ).spinner( "value", current );

‎demos/spinner/default.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
$(function() {
1616
var spinner = $( "#spinner" ).spinner();
1717

18-
$( "#disable" ).click(function() {
18+
$( "#disable" ).on( "click", function() {
1919
if ( spinner.spinner( "option", "disabled" ) ) {
2020
spinner.spinner( "enable" );
2121
} else {
2222
spinner.spinner( "disable" );
2323
}
2424
});
25-
$( "#destroy" ).click(function() {
25+
$( "#destroy" ).on( "click", function() {
2626
if ( spinner.spinner( "instance" ) ) {
2727
spinner.spinner( "destroy" );
2828
} else {
2929
spinner.spinner();
3030
}
3131
});
32-
$( "#getvalue" ).click(function() {
32+
$( "#getvalue" ).on( "click", function() {
3333
alert( spinner.spinner( "value" ) );
3434
});
35-
$( "#setvalue" ).click(function() {
35+
$( "#setvalue" ).on( "click", function() {
3636
spinner.spinner( "value", 5 );
3737
});
3838

‎demos/spinner/time.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
$(function() {
4242
$( "#spinner" ).timespinner();
4343

44-
$( "#culture" ).change(function() {
44+
$( "#culture" ).on( "change", function() {
4545
var current = $( "#spinner" ).timespinner( "value" );
4646
Globalize.culture( $(this).val() );
4747
$( "#spinner" ).timespinner( "value", current );

‎tests/unit/spinner/core.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ asyncTest( "blur input while spinning with UP", function() {
114114
value = element.val();
115115
ok( value > 11, "repeating while key is down" );
116116

117-
element.bind( "blur", function() {
117+
element.on( "blur", function() {
118118
value = element.val();
119119
setTimeout( step3, 750 );
120120
})[ 0 ].blur();
@@ -225,16 +225,16 @@ test( "ARIA attributes", function() {
225225
test( "focus text field when pressing button", function() {
226226
expect( 2 );
227227
var element = $( "#spin" ).spinner();
228-
$( "body" ).focus();
228+
$( "body" ).trigger( "focus" );
229229
ok( element[ 0 ] !== document.activeElement, "not focused before" );
230-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown();
230+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" );
231231
ok( element[ 0 ] === document.activeElement, "focused after" );
232232
});
233233

234234
test( "don't clear invalid value on blur", function() {
235235
expect( 1 );
236236
var element = $( "#spin" ).spinner();
237-
element.focus().val( "a" ).blur();
237+
element.trigger( "focus" ).val( "a" ).trigger( "blur" );
238238
equal( element.val(), "a" );
239239
});
240240

‎tests/unit/spinner/events.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ test( "start", function() {
2929
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
3030

3131
shouldStart( true, "button up" );
32-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
32+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
3333
shouldStart( true, "button down" );
34-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
34+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
3535

3636
shouldStart( true, "stepUp" );
3737
element.spinner( "stepUp" );
@@ -68,9 +68,9 @@ test( "spin", function() {
6868
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
6969

7070
shouldSpin( true, "button up" );
71-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
71+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
7272
shouldSpin( true, "button down" );
73-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
73+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
7474

7575
shouldSpin( true, "stepUp" );
7676
element.spinner( "stepUp" );
@@ -107,9 +107,9 @@ test( "stop", function() {
107107
simulateKeyDownUp( element, $.ui.keyCode.PAGE_DOWN );
108108

109109
shouldStop( true, "button up" );
110-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
110+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
111111
shouldStop( true, "button down" );
112-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
112+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
113113

114114
shouldStop( true, "stepUp" );
115115
element.spinner( "stepUp" );
@@ -200,26 +200,26 @@ asyncTest( "change", function() {
200200
shouldChange( false, "blur after many keys, same final value" );
201201

202202
shouldChange( false, "button up, before blur" );
203-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
203+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
204204
shouldChange( true, "blur after button up" );
205205
}, step7 );
206206
}
207207

208208
function step7() {
209209
focusWrap(function() {
210210
shouldChange( false, "button down, before blur" );
211-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
211+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
212212
shouldChange( true, "blur after button down" );
213213
}, step8 );
214214
}
215215

216216
function step8() {
217217
focusWrap(function() {
218218
shouldChange( false, "many buttons, same final value, before blur" );
219-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
220-
element.spinner( "widget" ).find( ".ui-spinner-up" ).mousedown().mouseup();
221-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
222-
element.spinner( "widget" ).find( ".ui-spinner-down" ).mousedown().mouseup();
219+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
220+
element.spinner( "widget" ).find( ".ui-spinner-up" ).trigger( "mousedown" ).trigger( "mouseup" );
221+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
222+
element.spinner( "widget" ).find( ".ui-spinner-down" ).trigger( "mousedown" ).trigger( "mouseup" );
223223
shouldChange( false, "blur after many buttons, same final value" );
224224
}, step9 );
225225
}

‎tests/unit/spinner/options.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ test( "max", function() {
181181
element.spinner( "value", 1000 );
182182
equal( element.val(), 100, "max constrained in value method" );
183183

184-
element.val( 1000 ).blur();
184+
element.val( 1000 ).trigger( "blur" );
185185
equal( element.val(), 1000, "max not constrained if manual entry" );
186186
});
187187

@@ -209,7 +209,7 @@ test( "min", function() {
209209
element.spinner( "value", -1000 );
210210
equal( element.val(), -100, "min constrained in value method" );
211211

212-
element.val( -1000 ).blur();
212+
element.val( -1000 ).trigger( "blur" );
213213
equal( element.val(), -1000, "min not constrained if manual entry" );
214214
});
215215

‎ui/spinner.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ return $.widget( "ui.spinner", {
165165
function checkFocus() {
166166
var isActive = this.element[ 0 ] === $.ui.safeActiveElement( this.document[ 0 ] );
167167
if ( !isActive ) {
168-
this.element.focus();
168+
this.element.trigger( "focus" );
169169
this.previous = previous;
170170
// support: IE
171171
// IE sets focus asynchronously, so we need to check if focus

0 commit comments

Comments
 (0)