diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2011-11-18 17:13:28 +0100 |
| commit | d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a (patch) | |
| tree | 185bf6282643a667a1e69837b106249156f71952 /demos/spinner | |
| parent | 26603de5bafb4fe9e824b28d8f799ed0f7e0604f (diff) | |
| parent | 66f9e12797c16d8fa9078f45401f08f0f200e1bc (diff) | |
| download | jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.tar.gz jquery-ui-d6e4d4705d3d3be01ab92ea4f07a52a59ba10b5a.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos/spinner')
| -rw-r--r-- | demos/spinner/currency.html | 6 | ||||
| -rw-r--r-- | demos/spinner/decimal.html | 2 | ||||
| -rw-r--r-- | demos/spinner/default.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 | 2 |
6 files changed, 7 insertions, 9 deletions
diff --git a/demos/spinner/currency.html b/demos/spinner/currency.html index f73c19f80..796b379a5 100644 --- a/demos/spinner/currency.html +++ b/demos/spinner/currency.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> @@ -17,9 +17,7 @@ <script> $(function() { $( "#currency" ).change(function() { - var current = $( "#spinner" ).spinner( "value" ); - Globalize.culture( $(this).val() ); - $( "#spinner" ).spinner( "value", current ); + $( "#spinner" ).spinner( "option", "culture", $( this ).val() ); }); $( "#spinner" ).spinner({ diff --git a/demos/spinner/decimal.html b/demos/spinner/decimal.html index 9d96613fe..4974ac830 100644 --- a/demos/spinner/decimal.html +++ b/demos/spinner/decimal.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner - Decimal</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> diff --git a/demos/spinner/default.html b/demos/spinner/default.html index c78c36d68..7798e46b3 100644 --- a/demos/spinner/default.html +++ b/demos/spinner/default.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html index 149d16103..ad51436d5 100644 --- a/demos/spinner/latlong.html +++ b/demos/spinner/latlong.html @@ -5,7 +5,7 @@ <title>jQuery UI Spinner - Map</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="http://maps.google.com/maps/api/js?sensor=false"></script> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> diff --git a/demos/spinner/overflow.html b/demos/spinner/overflow.html index d55a48b01..f76ffc9c2 100644 --- a/demos/spinner/overflow.html +++ b/demos/spinner/overflow.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner - Overflow</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> diff --git a/demos/spinner/time.html b/demos/spinner/time.html index 175407f4a..b42dc2f87 100644 --- a/demos/spinner/time.html +++ b/demos/spinner/time.html @@ -4,7 +4,7 @@ <meta charset="utf-8"> <title>jQuery UI Spinner - Time</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> - <script src="../../jquery-1.6.2.js"></script> + <script src="../../jquery-1.7.js"></script> <script src="../../external/jquery.mousewheel-3.0.4.js"></script> <script src="../../external/globalize.js"></script> <script src="../../external/globalize.culture.de-DE.js"></script> |