diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2011-02-08 09:22:45 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2011-02-08 09:22:45 -0500 |
| commit | fba3349e38d9a9545f10e2ac1ae893053c9fc02a (patch) | |
| tree | 14d753bdb5e7ad76840fe68a5f6b8441039085e5 | |
| parent | 93916b4d01373a7be3d48c0d8fc3d66e904b5eeb (diff) | |
| parent | ce51edefb326aa1838c2c62406a2ee2c8efb648a (diff) | |
| download | jquery-ui-fba3349e38d9a9545f10e2ac1ae893053c9fc02a.tar.gz jquery-ui-fba3349e38d9a9545f10e2ac1ae893053c9fc02a.zip | |
Merge branch 'master' of github.com:jquery/jquery-ui
| -rw-r--r-- | demos/spinner/currency.html | 4 | ||||
| -rw-r--r-- | demos/spinner/decimal.html | 4 | ||||
| -rw-r--r-- | demos/spinner/default.html | 2 | ||||
| -rw-r--r-- | demos/spinner/index.html | 2 | ||||
| -rw-r--r-- | demos/spinner/latlong.html | 2 | ||||
| -rw-r--r-- | demos/spinner/overflow.html | 2 | ||||
| -rw-r--r-- | demos/spinner/time.html | 9 | ||||
| -rw-r--r-- | ui/jquery.ui.spinner.js | 10 |
8 files changed, 19 insertions, 16 deletions
diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html index 1c2f01a72..44fed4c42 100644 --- a/demos/spinner/currency.html +++ b/demos/spinner/currency.html @@ -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);
})
diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html index f396c18d2..5b4af2823 100644 --- a/demos/spinner/decimal.html +++ b/demos/spinner/decimal.html @@ -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);
})
});
diff --git a/demos/spinner/default.html b/demos/spinner/default.html index d33f3e241..14e0cf9f9 100644 --- a/demos/spinner/default.html +++ b/demos/spinner/default.html @@ -1,4 +1,4 @@ -<!doctype html>
+<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
diff --git a/demos/spinner/index.html b/demos/spinner/index.html index a49fa1368..c1b9d9288 100644 --- a/demos/spinner/index.html +++ b/demos/spinner/index.html @@ -1,4 +1,4 @@ -<!doctype html>
+<!DOCTYPE html>
<html lang="en">
<head>
<title>jQuery UI Spinner Demos</title>
diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html index 7decacbdc..a99caa67b 100644 --- a/demos/spinner/latlong.html +++ b/demos/spinner/latlong.html @@ -1,4 +1,4 @@ -<!doctype html>
+<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
diff --git a/demos/spinner/overflow.html b/demos/spinner/overflow.html index 8f489646a..bbdc18437 100644 --- a/demos/spinner/overflow.html +++ b/demos/spinner/overflow.html @@ -1,4 +1,4 @@ -<!doctype html>
+<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
diff --git a/demos/spinner/time.html b/demos/spinner/time.html index 8c5560507..d92b942dc 100644 --- a/demos/spinner/time.html +++ b/demos/spinner/time.html @@ -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);
});
});
diff --git a/ui/jquery.ui.spinner.js b/ui/jquery.ui.spinner.js index df61a7494..0219abb8b 100644 --- a/ui/jquery.ui.spinner.js +++ b/ui/jquery.ui.spinner.js @@ -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 ); }, |