library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery-ui

Browse Source
This commit is contained in:
Scott González 2011-02-08 09:22:45 -05:00
commit fba3349e38
8 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/spinner/currency.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -18,7 +18,7 @@
$(function() {
$("#currency").change(function() {
var current = $("#spinner").spinner("value");
Globalization.preferCulture($(this).val());
$.global.preferCulture($(this).val());
$("#spinner").spinner("value", current);
})

4
demos/spinner/decimal.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -23,7 +23,7 @@
$("#culture").change(function() {
var current = $("#spinner").spinner("value");
Globalization.preferCulture($(this).val());
$.global.preferCulture($(this).val());
$("#spinner").spinner("value", current);
})
});

2
demos/spinner/default.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">

2
demos/spinner/index.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<title>jQuery UI Spinner Demos</title>

2
demos/spinner/latlong.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">

2
demos/spinner/overflow.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">

9
demos/spinner/time.html
View File

@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
@ -24,21 +24,20 @@
_parse: function(value) {
if (typeof value == 'string') {
return +Globalization.parseDate(value)
return +$.global.parseDate(value)
}
return value;
},
_format: function() {
this.element.val( Globalization.format(new Date(this.options.value), "t") );
this.element.val( $.global.format(new Date(this.options.value), "t") );
}
})
$(function() {
$("#spinner").timespinner();
$("#culture").change(function() {
var current = $("#spinner").timespinner("value");
Globalization.preferCulture($(this).val());
$.global.preferCulture($(this).val());
$("#spinner").timespinner("value", current);
});
});

10
ui/jquery.ui.spinner.js vendored
View File

@ -285,11 +285,16 @@ $.widget('ui.spinner', {
this.buttons.button("enable");
}
}
this._super( "_setOption", key, value );
// TODO see below
//this._super( "_setOption", key, value );
$.Widget.prototype._setOption.apply( this, arguments );
},
_setOptions: function( options ) {
this._super( "_setOptions", options );
// TODO _super doesn't handle inheritance with more then one subclass
// spinner subclass will have spinner as base, calling spinner._setOptions infinitely
//this._super( "_setOptions", options );
$.Widget.prototype._setOptions.apply( this, arguments );
if ( "value" in options ) {
this._format( this.options.value );
}
@ -312,7 +317,6 @@ $.widget('ui.spinner', {
},
_format: function(num) {
var num = this.options.value;
this.element.val( $.global && this.options.numberformat ? $.global.format(num, this.options.numberformat) : num );
},