Skip to content

Commit 56e9cd7

Browse files
jzaeffererjzaefferer
committed
Replace $.global with Globalize, update Spinner to use it. Related demos currently broken due to previous changes.
1 parent bb79b41 commit 56e9cd7

File tree

10 files changed

+1773
-1489
lines changed

10 files changed

+1773
-1489
lines changed

‎demos/spinner/currency.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
9-
<script src="../../external/jquery.global.js"></script>
10-
<script src="../../external/jquery.global.de-DE.js"></script>
11-
<script src="../../external/jquery.global.ja-JP.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>
1212
<script src="../../ui/jquery.ui.core.js"></script>
1313
<script src="../../ui/jquery.ui.widget.js"></script>
1414
<script src="../../ui/jquery.ui.button.js"></script>
@@ -18,7 +18,7 @@
1818
$(function() {
1919
$( "#currency" ).change(function() {
2020
var current = $( "#spinner" ).spinner( "value" );
21-
$.global.preferCulture( $(this).val() );
21+
Globalize.culture( $(this).val() );
2222
$( "#spinner" ).spinner( "value", current );
2323
});
2424

@@ -28,7 +28,7 @@
2828
step: 25,
2929
start: 1000,
3030
numberFormat: "C"
31-
});
31+
});
3232
});
3333
</script>
3434
</head>
@@ -42,7 +42,7 @@
4242
<option value="en-US">US $</option>
4343
<option value="de-DE">EUR €</option>
4444
<option value="ja-JP">YEN ¥</option>
45-
</select>
45+
</select>
4646
</p>
4747
<p>
4848
<label for="spinner">Amount to donate:</label>

‎demos/spinner/decimal.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
9-
<script src="../../external/jquery.global.js"></script>
10-
<script src="../../external/jquery.global.de-DE.js"></script>
11-
<script src="../../external/jquery.global.ja-JP.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>
1212
<script src="../../ui/jquery.ui.core.js"></script>
1313
<script src="../../ui/jquery.ui.widget.js"></script>
1414
<script src="../../ui/jquery.ui.button.js"></script>
@@ -19,11 +19,11 @@
1919
$( "#spinner" ).spinner({
2020
step: 0.01,
2121
numberFormat: "n"
22-
});
22+
});
2323

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

‎demos/spinner/time.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css">
77
<script src="../../jquery-1.6.2.js"></script>
88
<script src="../../external/jquery.mousewheel-3.0.4.js"></script>
9-
<script src="../../external/jquery.global.js"></script>
10-
<script src="../../external/jquery.global.de-DE.js"></script>
9+
<script src="../../external/globalize.js"></script>
10+
<script src="../../external/globalize.culture.de-DE.js"></script>
1111
<script src="../../ui/jquery.ui.core.js"></script>
1212
<script src="../../ui/jquery.ui.widget.js"></script>
1313
<script src="../../ui/jquery.ui.button.js"></script>
@@ -24,13 +24,13 @@
2424

2525
_parse: function( value ) {
2626
if ( typeof value === "string" ) {
27-
return +$.global.parseDate( value );
27+
return +Globalize.parseDate( value );
2828
}
2929
return value;
3030
},
3131

3232
_format: function() {
33-
this.element.val( $.global.format( new Date(this.options.value), "t" ) );
33+
this.element.val( Globalize.format( new Date(this.options.value), "t" ) );
3434
}
3535
});
3636

@@ -39,7 +39,7 @@
3939

4040
$( "#culture" ).change(function() {
4141
var current = $( "#spinner" ).timespinner( "value" );
42-
$.global.preferCulture( $(this).val() );
42+
Globalize.culture( $(this).val() );
4343
$( "#spinner" ).timespinner( "value", current );
4444
});
4545
});

‎external/globalize.culture.de-DE.js

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
/*
2+
* Globalize Culture de-DE
3+
*
4+
* http://github.com/jquery/globalize
5+
*
6+
* Copyright Software Freedom Conservancy, Inc.
7+
* Dual licensed under the MIT or GPL Version 2 licenses.
8+
* http://jquery.org/license
9+
*
10+
* This file was generated by the Globalize Culture Generator
11+
* Translation: bugs found in this file need to be fixed in the generator
12+
*/
13+
14+
(function( window, undefined ) {
15+
16+
var Globalize;
17+
18+
if ( typeof require !== "undefined"
19+
&& typeof exports !== "undefined"
20+
&& typeof module !== "undefined" ) {
21+
// Assume CommonJS
22+
Globalize = require( "globalize" );
23+
} else {
24+
// Global variable
25+
Globalize = window.Globalize;
26+
}
27+
28+
Globalize.addCultureInfo( "de-DE", "default", {
29+
name: "de-DE",
30+
englishName: "German (Germany)",
31+
nativeName: "Deutsch (Deutschland)",
32+
language: "de",
33+
numberFormat: {
34+
",": ".",
35+
".": ",",
36+
NaN: "n. def.",
37+
negativeInfinity: "-unendlich",
38+
positiveInfinity: "+unendlich",
39+
percent: {
40+
pattern: ["-n%","n%"],
41+
",": ".",
42+
".": ","
43+
},
44+
currency: {
45+
pattern: ["-n $","n $"],
46+
",": ".",
47+
".": ",",
48+
symbol: "€"
49+
}
50+
},
51+
calendars: {
52+
standard: {
53+
"/": ".",
54+
firstDay: 1,
55+
days: {
56+
names: ["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],
57+
namesAbbr: ["So","Mo","Di","Mi","Do","Fr","Sa"],
58+
namesShort: ["So","Mo","Di","Mi","Do","Fr","Sa"]
59+
},
60+
months: {
61+
names: ["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember",""],
62+
namesAbbr: ["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez",""]
63+
},
64+
AM: null,
65+
PM: null,
66+
eras: [{"name":"n. Chr.","start":null,"offset":0}],
67+
patterns: {
68+
d: "dd.MM.yyyy",
69+
D: "dddd, d. MMMM yyyy",
70+
t: "HH:mm",
71+
T: "HH:mm:ss",
72+
f: "dddd, d. MMMM yyyy HH:mm",
73+
F: "dddd, d. MMMM yyyy HH:mm:ss",
74+
M: "dd MMMM",
75+
Y: "MMMM yyyy"
76+
}
77+
}
78+
}
79+
});
80+
81+
}( this ));

‎external/globalize.culture.ja-JP.js

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
/*
2+
* Globalize Culture ja-JP
3+
*
4+
* http://github.com/jquery/globalize
5+
*
6+
* Copyright Software Freedom Conservancy, Inc.
7+
* Dual licensed under the MIT or GPL Version 2 licenses.
8+
* http://jquery.org/license
9+
*
10+
* This file was generated by the Globalize Culture Generator
11+
* Translation: bugs found in this file need to be fixed in the generator
12+
*/
13+
14+
(function( window, undefined ) {
15+
16+
var Globalize;
17+
18+
if ( typeof require !== "undefined"
19+
&& typeof exports !== "undefined"
20+
&& typeof module !== "undefined" ) {
21+
// Assume CommonJS
22+
Globalize = require( "globalize" );
23+
} else {
24+
// Global variable
25+
Globalize = window.Globalize;
26+
}
27+
28+
Globalize.addCultureInfo( "ja-JP", "default", {
29+
name: "ja-JP",
30+
englishName: "Japanese (Japan)",
31+
nativeName: "日本語 (日本)",
32+
language: "ja",
33+
numberFormat: {
34+
NaN: "NaN (非数値)",
35+
negativeInfinity: "-∞",
36+
positiveInfinity: "+∞",
37+
percent: {
38+
pattern: ["-n%","n%"]
39+
},
40+
currency: {
41+
pattern: ["-$n","$n"],
42+
decimals: 0,
43+
symbol: "¥"
44+
}
45+
},
46+
calendars: {
47+
standard: {
48+
days: {
49+
names: ["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],
50+
namesAbbr: ["日","月","火","水","木","金","土"],
51+
namesShort: ["日","月","火","水","木","金","土"]
52+
},
53+
months: {
54+
names: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月",""],
55+
namesAbbr: ["1","2","3","4","5","6","7","8","9","10","11","12",""]
56+
},
57+
AM: ["午前","午前","午前"],
58+
PM: ["午後","午後","午後"],
59+
eras: [{"name":"西暦","start":null,"offset":0}],
60+
patterns: {
61+
d: "yyyy/MM/dd",
62+
D: "yyyy'年'M'月'd'日'",
63+
t: "H:mm",
64+
T: "H:mm:ss",
65+
f: "yyyy'年'M'月'd'日' H:mm",
66+
F: "yyyy'年'M'月'd'日' H:mm:ss",
67+
M: "M'月'd'日'",
68+
Y: "yyyy'年'M'月'"
69+
}
70+
},
71+
Japanese: {
72+
name: "Japanese",
73+
days: {
74+
names: ["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],
75+
namesAbbr: ["日","月","火","水","木","金","土"],
76+
namesShort: ["日","月","火","水","木","金","土"]
77+
},
78+
months: {
79+
names: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月",""],
80+
namesAbbr: ["1","2","3","4","5","6","7","8","9","10","11","12",""]
81+
},
82+
AM: ["午前","午前","午前"],
83+
PM: ["午後","午後","午後"],
84+
eras: [{"name":"平成","start":null,"offset":1867},{"name":"昭和","start":-1812153600000,"offset":1911},{"name":"大正","start":-1357603200000,"offset":1925},{"name":"明治","start":60022080000,"offset":1988}],
85+
twoDigitYearMax: 99,
86+
patterns: {
87+
d: "gg y/M/d",
88+
D: "gg y'年'M'月'd'日'",
89+
t: "H:mm",
90+
T: "H:mm:ss",
91+
f: "gg y'年'M'月'd'日' H:mm",
92+
F: "gg y'年'M'月'd'日' H:mm:ss",
93+
M: "M'月'd'日'",
94+
Y: "gg y'年'M'月'"
95+
}
96+
}
97+
}
98+
});
99+
100+
}( this ));

0 commit comments

Comments
 (0)