Skip to content

Commit fba3349

Browse files
committed
Merge branch 'master' of github.com:jquery/jquery-ui
2 parents 93916b4 + ce51ede commit fba3349

File tree

8 files changed

+19
-16
lines changed

8 files changed

+19
-16
lines changed

demos/spinner/currency.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
@@ -18,7 +18,7 @@
1818
$(function() {
1919
$("#currency").change(function() {
2020
var current = $("#spinner").spinner("value");
21-
Globalization.preferCulture($(this).val());
21+
$.global.preferCulture($(this).val());
2222
$("#spinner").spinner("value", current);
2323
})
2424

demos/spinner/decimal.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
@@ -23,7 +23,7 @@
2323

2424
$("#culture").change(function() {
2525
var current = $("#spinner").spinner("value");
26-
Globalization.preferCulture($(this).val());
26+
$.global.preferCulture($(this).val());
2727
$("#spinner").spinner("value", current);
2828
})
2929
});

demos/spinner/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">

demos/spinner/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<title>jQuery UI Spinner Demos</title>

demos/spinner/latlong.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">

demos/spinner/overflow.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">

demos/spinner/time.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!doctype html>
1+
<!DOCTYPE html>
22
<html lang="en">
33
<head>
44
<meta charset="utf-8">
@@ -24,21 +24,20 @@
2424

2525
_parse: function(value) {
2626
if (typeof value == 'string') {
27-
return +Globalization.parseDate(value)
27+
return +$.global.parseDate(value)
2828
}
2929
return value;
3030
},
3131
_format: function() {
32-
this.element.val( Globalization.format(new Date(this.options.value), "t") );
32+
this.element.val( $.global.format(new Date(this.options.value), "t") );
3333
}
3434
})
3535
$(function() {
3636
$("#spinner").timespinner();
3737

38-
3938
$("#culture").change(function() {
4039
var current = $("#spinner").timespinner("value");
41-
Globalization.preferCulture($(this).val());
40+
$.global.preferCulture($(this).val());
4241
$("#spinner").timespinner("value", current);
4342
});
4443
});

ui/jquery.ui.spinner.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,11 +285,16 @@ $.widget('ui.spinner', {
285285
this.buttons.button("enable");
286286
}
287287
}
288-
this._super( "_setOption", key, value );
288+
// TODO see below
289+
//this._super( "_setOption", key, value );
290+
$.Widget.prototype._setOption.apply( this, arguments );
289291
},
290292

291293
_setOptions: function( options ) {
292-
this._super( "_setOptions", options );
294+
// TODO _super doesn't handle inheritance with more then one subclass
295+
// spinner subclass will have spinner as base, calling spinner._setOptions infinitely
296+
//this._super( "_setOptions", options );
297+
$.Widget.prototype._setOptions.apply( this, arguments );
293298
if ( "value" in options ) {
294299
this._format( this.options.value );
295300
}
@@ -312,7 +317,6 @@ $.widget('ui.spinner', {
312317
},
313318

314319
_format: function(num) {
315-
var num = this.options.value;
316320
this.element.val( $.global && this.options.numberformat ? $.global.format(num, this.options.numberformat) : num );
317321
},
318322

0 commit comments

Comments
 (0)