Skip to content

Commit d877e1d

Browse files
rxaviersrxaviers
committed
Spinner: Update demos FIXME
1 parent e1b0a27 commit d877e1d

File tree

7 files changed

+316
-171
lines changed

7 files changed

+316
-171
lines changed

‎bower.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
{
2-
"name": "jquery-ui",
3-
"ignore": [
4-
"**/.*",
5-
"build",
6-
"demos",
7-
"external",
8-
"tests"
9-
],
10-
"dependencies": {
11-
"jquery": ">=1.6 <1.11"
12-
},
13-
"devDependencies": {
14-
"jquery-mousewheel": "3.1.11",
15-
"jshint": "2.4.4",
16-
"qunit": "1.14.0"
17-
}
2+
"name": "jquery-ui",
3+
"ignore": [
4+
"**/.*",
5+
"build",
6+
"demos",
7+
"external",
8+
"tests"
9+
],
10+
"dependencies": {
11+
"jquery": ">1.6",
12+
"requirejs": "~2.1.14",
13+
"globalize": "1.x",
14+
"requirejs-plugins": "~1.0.2",
15+
"requirejs-text": "~2.0.12"
16+
},
17+
"devDependencies": {
18+
"jquery-mousewheel": "3.1.11",
19+
"jshint": "2.4.4",
20+
"qunit": "1.14.0"
21+
}
1822
}

‎demos/spinner/currency.html

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,6 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Spinner - Currency</title>
66
<link rel="stylesheet" href="../../themes/base/all.css">
7-
<script src="../../jquery.js"></script>
8-
<script src="../../external/jquery.mousewheel.js"></script>
9-
<script src="../../external/globalize.js"></script>
10-
<script src="../../external/globalize.culture.de-DE.js"></script>
11-
<script src="../../external/globalize.culture.ja-JP.js"></script>
12-
<script src="../../ui/core.js"></script>
13-
<script src="../../ui/widget.js"></script>
14-
<script src="../../ui/button.js"></script>
15-
<script src="../../ui/spinner.js"></script>
167
<link rel="stylesheet" href="../demos.css">
178
<script>
189
$(function() {
@@ -49,5 +40,6 @@
4940
<div class="demo-description">
5041
<p>Example of a donation form, with currency selection and amount spinner.</p>
5142
</div>
43+
5244
</body>
5345
</html>

‎demos/spinner/decimal.html

Lines changed: 54 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Spinner - Decimal</title>
66
<link rel="stylesheet" href="../../themes/base/all.css">
7-
<script src="../../jquery.js"></script>
8-
<script src="../../external/jquery.mousewheel.js"></script>
9-
<script src="../../external/globalize.js"></script>
10-
<script src="../../external/globalize.culture.de-DE.js"></script>
11-
<script src="../../external/globalize.culture.ja-JP.js"></script>
12-
<script src="../../ui/core.js"></script>
13-
<script src="../../ui/widget.js"></script>
14-
<script src="../../ui/button.js"></script>
15-
<script src="../../ui/spinner.js"></script>
167
<link rel="stylesheet" href="../demos.css">
17-
<script>
18-
$(function() {
19-
$( "#spinner" ).spinner({
20-
step: 0.01,
21-
numberFormat: "n"
22-
});
23-
24-
$( "#culture" ).change(function() {
25-
var current = $( "#spinner" ).spinner( "value" );
26-
Globalize.culture( $(this).val() );
27-
$( "#spinner" ).spinner( "value", current );
28-
});
29-
});
30-
</script>
318
</head>
329
<body>
3310

@@ -38,9 +15,9 @@
3815
<p>
3916
<label for="culture">Select a culture to use for formatting:</label>
4017
<select id="culture">
41-
<option value="en-EN" selected="selected">English</option>
42-
<option value="de-DE">German</option>
43-
<option value="ja-JP">Japanese</option>
18+
<option value="en" selected="selected">English</option>
19+
<option value="es">Spanish</option>
20+
<option value="ar">Arabic</option>
4421
</select>
4522
</p>
4623

@@ -52,5 +29,56 @@
5229
formatting, based on the new culture.
5330
</p>
5431
</div>
32+
33+
<script src="../../deleteme/requirejs/require.js"></script>
34+
<script>
35+
36+
require.config({
37+
paths: {
38+
cldr: "../../deleteme/cldrjs/dist/cldr",
39+
"cldr-data": "../../deleteme/cldr",
40+
globalize: "../../deleteme/globalize/dist/globalize",
41+
jquery: "../../deleteme/jquery/dist/jquery",
42+
json: "../../deleteme/requirejs-plugins/src/json",
43+
text: "../../deleteme/requirejs-text/text",
44+
ui: "../../ui"
45+
}
46+
});
47+
48+
require([
49+
"jquery",
50+
"globalize",
51+
"json!cldr-data/main/ar/numbers.json",
52+
"json!cldr-data/main/en/numbers.json",
53+
"json!cldr-data/main/es/numbers.json",
54+
"json!cldr-data/supplemental/likelySubtags.json",
55+
"globalize/number",
56+
"ui/spinner"
57+
], function( $, Globalize, arNumbers, enNumbers, esNumbers, likelySubtags ) {
58+
59+
Globalize.load( arNumbers );
60+
Globalize.load( enNumbers );
61+
Globalize.load( esNumbers );
62+
Globalize.load( likelySubtags );
63+
Globalize.locale( "en" );
64+
65+
$( "#spinner" ).spinner({
66+
step: 0.01,
67+
numberFormat: {
68+
maximumFractionDigits: 2,
69+
minimumFractionDigits: 2
70+
}
71+
});
72+
73+
$( "#culture" ).change(function() {
74+
var current = $( "#spinner" ).spinner( "value" );
75+
Globalize.locale( $(this).val() );
76+
$( "#spinner" ).spinner( "value", current );
77+
});
78+
79+
});
80+
81+
</script>
82+
5583
</body>
5684
</html>

‎demos/spinner/default.html

Lines changed: 63 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,7 @@
44
<meta charset="utf-8">
55
<title>jQuery UI Spinner - Default functionality</title>
66
<link rel="stylesheet" href="../../themes/base/all.css">
7-
<script src="../../jquery.js"></script>
8-
<script src="../../external/jquery.mousewheel.js"></script>
9-
<script src="../../ui/core.js"></script>
10-
<script src="../../ui/widget.js"></script>
11-
<script src="../../ui/button.js"></script>
12-
<script src="../../ui/spinner.js"></script>
137
<link rel="stylesheet" href="../demos.css">
14-
<script>
15-
$(function() {
16-
var spinner = $( "#spinner" ).spinner();
17-
18-
$( "#disable" ).click(function() {
19-
if ( spinner.spinner( "option", "disabled" ) ) {
20-
spinner.spinner( "enable" );
21-
} else {
22-
spinner.spinner( "disable" );
23-
}
24-
});
25-
$( "#destroy" ).click(function() {
26-
if ( spinner.spinner( "instance" ) ) {
27-
spinner.spinner( "destroy" );
28-
} else {
29-
spinner.spinner();
30-
}
31-
});
32-
$( "#getvalue" ).click(function() {
33-
alert( spinner.spinner( "value" ) );
34-
});
35-
$( "#setvalue" ).click(function() {
36-
spinner.spinner( "value", 5 );
37-
});
38-
39-
$( "button" ).button();
40-
});
41-
</script>
428
</head>
439
<body>
4410

@@ -60,5 +26,68 @@
6026
<div class="demo-description">
6127
<p>Default spinner.</p>
6228
</div>
29+
30+
<script src="../../deleteme/requirejs/require.js"></script>
31+
<script>
32+
33+
require.config({
34+
paths: {
35+
cldr: "../../deleteme/cldrjs/dist/cldr",
36+
"cldr-data": "../../deleteme/cldr",
37+
globalize: "../../deleteme/globalize/dist/globalize",
38+
jquery: "../../deleteme/jquery/dist/jquery",
39+
"jquery-mousewheel": "../../deleteme/jquery-mousewheel/jquery.mousewheel",
40+
json: "../../deleteme/requirejs-plugins/src/json",
41+
text: "../../deleteme/requirejs-text/text",
42+
ui: "../../ui"
43+
}
44+
});
45+
46+
require([
47+
"jquery",
48+
"globalize",
49+
"json!cldr-data/main/ar/numbers.json",
50+
"json!cldr-data/main/en/numbers.json",
51+
"json!cldr-data/main/es/numbers.json",
52+
"json!cldr-data/supplemental/likelySubtags.json",
53+
"globalize/number",
54+
"ui/spinner"
55+
], function( $, Globalize, arNumbers, enNumbers, esNumbers, likelySubtags ) {
56+
57+
Globalize.load( arNumbers );
58+
Globalize.load( enNumbers );
59+
Globalize.load( esNumbers );
60+
Globalize.load( likelySubtags );
61+
Globalize.locale( "en" );
62+
63+
var spinner = $( "#spinner" ).spinner();
64+
65+
$( "#disable" ).click(function() {
66+
if ( spinner.spinner( "option", "disabled" ) ) {
67+
spinner.spinner( "enable" );
68+
} else {
69+
spinner.spinner( "disable" );
70+
}
71+
});
72+
$( "#destroy" ).click(function() {
73+
if ( spinner.spinner( "instance" ) ) {
74+
spinner.spinner( "destroy" );
75+
} else {
76+
spinner.spinner();
77+
}
78+
});
79+
$( "#getvalue" ).click(function() {
80+
alert( spinner.spinner( "value" ) );
81+
});
82+
$( "#setvalue" ).click(function() {
83+
spinner.spinner( "value", 5 );
84+
});
85+
86+
$( "button" ).button();
87+
88+
});
89+
90+
</script>
91+
6392
</body>
6493
</html>

‎demos/spinner/latlong.html

Lines changed: 59 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,7 @@
55
<title>jQuery UI Spinner - Map</title>
66
<link rel="stylesheet" href="../../themes/base/all.css">
77
<script src="http://maps.google.com/maps/api/js?sensor=false"></script>
8-
<script src="../../jquery.js"></script>
9-
<script src="../../external/jquery.mousewheel.js"></script>
10-
<script src="../../ui/core.js"></script>
11-
<script src="../../ui/widget.js"></script>
12-
<script src="../../ui/button.js"></script>
13-
<script src="../../ui/spinner.js"></script>
148
<link rel="stylesheet" href="../demos.css">
15-
<script>
16-
$(function() {
17-
function latlong() {
18-
return new google.maps.LatLng( $("#lat").val(), $("#lng").val() );
19-
}
20-
function position() {
21-
map.setCenter( latlong() );
22-
}
23-
$( "#lat, #lng" ).spinner({
24-
step: .001,
25-
change: position,
26-
stop: position
27-
});
28-
29-
var map = new google.maps.Map( $("#map")[0], {
30-
zoom: 8,
31-
center: latlong(),
32-
mapTypeId: google.maps.MapTypeId.ROADMAP
33-
});
34-
});
35-
</script>
369
<style>
3710
#map {
3811
width:500px;
@@ -53,5 +26,64 @@
5326
<div class="demo-description">
5427
<p>Google Maps integration, using spinners to change latitude and longitude.</p>
5528
</div>
29+
30+
<script src="../../deleteme/requirejs/require.js"></script>
31+
<script>
32+
33+
require.config({
34+
paths: {
35+
cldr: "../../deleteme/cldrjs/dist/cldr",
36+
"cldr-data": "../../deleteme/cldr",
37+
globalize: "../../deleteme/globalize/dist/globalize",
38+
jquery: "../../deleteme/jquery/dist/jquery",
39+
"jquery-mousewheel": "../../deleteme/jquery-mousewheel/jquery.mousewheel",
40+
json: "../../deleteme/requirejs-plugins/src/json",
41+
text: "../../deleteme/requirejs-text/text",
42+
ui: "../../ui"
43+
}
44+
});
45+
46+
require([
47+
"jquery",
48+
"globalize",
49+
"json!cldr-data/main/ar/numbers.json",
50+
"json!cldr-data/main/en/numbers.json",
51+
"json!cldr-data/main/es/numbers.json",
52+
"json!cldr-data/supplemental/likelySubtags.json",
53+
"globalize/number",
54+
"ui/spinner"
55+
], function( $, Globalize, arNumbers, enNumbers, esNumbers, likelySubtags ) {
56+
57+
Globalize.load( arNumbers );
58+
Globalize.load( enNumbers );
59+
Globalize.load( esNumbers );
60+
Globalize.load( likelySubtags );
61+
Globalize.locale( "en" );
62+
63+
function latlong() {
64+
return new google.maps.LatLng( $("#lat").val(), $("#lng").val() );
65+
}
66+
function position() {
67+
map.setCenter( latlong() );
68+
}
69+
$( "#lat, #lng" ).spinner({
70+
step: .001,
71+
change: position,
72+
stop: position,
73+
numberFormat: {
74+
minimumFractionDigits: 3
75+
}
76+
});
77+
78+
var map = new google.maps.Map( $("#map")[0], {
79+
zoom: 8,
80+
center: latlong(),
81+
mapTypeId: google.maps.MapTypeId.ROADMAP
82+
});
83+
84+
});
85+
86+
</script>
87+
5688
</body>
5789
</html>

0 commit comments

Comments
 (0)