r104662 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r104661‎ \| r104662 \| r104663 >
Date:	09:53, 30 November 2011
Author:	santhosh
Status:	ok
Tags:
Comment:	Add version number to the fonts and use that in the css. This enables us to push latest version of the font by overriding the cached version. (i18n card #278)
Modified paths:	/trunk/extensions/WebFonts/resources/ext.webfonts.fontlist.js (modified) (history) /trunk/extensions/WebFonts/resources/ext.webfonts.js (modified) (history)

Diff [purge]

Index: trunk/extensions/WebFonts/resources/ext.webfonts.js
—	—	@@ -104,12 +104,17 @@
105	105	var fontconfig = mw.webfonts.config.fonts[fontFamily];
106	106	var base = mw.config.get( 'wgExtensionAssetsPath' ) + '/WebFonts/fonts/';
107	107	var fontFormats = [];
	108	+ var version = "0.0";
	109	+ if ( 'version' in fontconfig ) {
	110	+ version = fontconfig.version;
	111	+ }
	112	+ var versionSuffix = "?version=" + version;
108	113	var styleString =
109	114	"<style type='text/css'>\n@font-face {\n"
110	115	+ "\tfont-family: '"+fontFamily+"';\n";
111	116
112	117	if ( 'eot' in fontconfig ) {
113		~~- styleString += "\tsrc: url('"+base+fontconfig.eot+"');\n";~~
	118	+ styleString += "\tsrc: url('" + base+ fontconfig.eot + versionSuffix+ "');\n";
114	119	}
115	120
116	121	styleString += "\tsrc: ";
—	—	@@ -122,15 +127,15 @@
123	128	}
124	129
125	130	if ( 'woff' in fontconfig ) {
126		~~- fontFormats.push( "\t\turl('"+base+fontconfig.woff+"') format('woff')" );~~
	131	+ fontFormats.push( "\t\turl('" + base + fontconfig.woff + versionSuffix + "') format('woff')" );
127	132	}
128	133
129	134	if ( 'svg' in fontconfig ) {
130		~~- fontFormats.push( "\t\turl('"+base+fontconfig.svg+"#"+fontFamily+"') format('svg')" );~~
	135	+ fontFormats.push( "\t\turl('" + base + fontconfig.svg + versionSuffix + "#" + fontFamily + "') format('svg')" );
131	136	}
132	137
133	138	if ( 'ttf' in fontconfig ) {
134		~~- fontFormats.push( "\t\turl('"+base+fontconfig.ttf+"') format('truetype')" );~~
	139	+ fontFormats.push( "\t\turl('" + base + fontconfig.ttf + versionSuffix + "') format('truetype')" );
135	140	}
136	141
137	142	styleString += fontFormats.join() + ";\n"
Index: trunk/extensions/WebFonts/resources/ext.webfonts.fontlist.js
—	—	@@ -10,168 +10,194 @@
11	11	"Iranian Sans": {
12	12	eot: "Arab/IranianSans.eot",
13	13	ttf: "Arab/IranianSans.ttf",
14		~~- woff: "Arab/IranianSans.woff"~~
	14	+ woff: "Arab/IranianSans.woff",
	15	+ version: "1.0"
15	16	},
16	17
17	18	"Lohit Bengali": {
18	19	eot: "Beng/Lohit-Bengali.eot",
19	20	ttf: "Beng/Lohit-Bengali.ttf",
20		~~- woff: "Beng/Lohit-Bengali.woff"~~
	21	+ woff: "Beng/Lohit-Bengali.woff",
	22	+ version: "2.5.0"
21	23	},
22	24
23	25	"Lohit Assamese": {
24	26	eot: "Beng/Lohit-Assamese.eot",
25	27	ttf: "Beng/Lohit-Assamese.ttf",
26		~~- woff: "Beng/Lohit-Assamese.woff"~~
	28	+ woff: "Beng/Lohit-Assamese.woff",
	29	+ version: "2.5.0"
27	30	},
28	31
29	32	"Lohit Devanagari": {
30	33	eot: "Deva/Lohit-Devanagari.eot",
31	34	ttf: "Deva/Lohit-Devanagari.ttf",
32		~~- woff: "Deva/Lohit-Devanagari.woff"~~
	35	+ woff: "Deva/Lohit-Devanagari.woff",
	36	+ version: "2.5.0"
33	37	},
34	38
35	39	"Samyak Devanagari": {
36	40	eot: "Deva/SamyakDevanagari.eot",
37	41	ttf: "Deva/SamyakDevanagari.ttf",
38		~~- woff: "Deva/SamyakDevanagari.woff"~~
	42	+ woff: "Deva/SamyakDevanagari.woff",
	43	+ version: "1.0"
39	44	},
40	45
41	46	AbyssinicaSIL: {
42	47	eot: "Ethi/AbyssinicaSIL-R.eot",
43	48	ttf: "Ethi/AbyssinicaSIL-R.ttf",
44		~~- woff: "Ethi/AbyssinicaSIL-R.woff"~~
	49	+ woff: "Ethi/AbyssinicaSIL-R.woff",
	50	+ version: "1.2"
45	51	},
46	52
47	53	"Lohit Gujarati": {
48	54	eot: "Gujr/Lohit-Gujarati.eot",
49	55	ttf: "Gujr/Lohit-Gujarati.ttf",
50		~~- woff: "Gujr/Lohit-Gujarati.woff"~~
	56	+ woff: "Gujr/Lohit-Gujarati.woff",
	57	+ version: "2.5.0"
51	58	},
52	59
53	60	"Samyak Gujarati": {
54	61	eot: "Gujr/SamyakGujarati.eot",
55	62	ttf: "Gujr/SamyakGujarati.ttf",
56		~~- woff: "Gujr/SamyakGujarati.woff"~~
	63	+ woff: "Gujr/SamyakGujarati.woff",
	64	+ version: "1.0"
57	65	},
58	66
59	67	"Miriam CLM": {
60	68	eot: "Hebr/MiriamCLM-Book.eot",
61	69	ttf: "Hebr/MiriamCLM-Book.ttf",
62		~~- woff: "Hebr/MiriamCLM-Book.woff"~~
	70	+ woff: "Hebr/MiriamCLM-Book.woff",
	71	+ version: "0.105"
63	72	},
64	73
65	74	"Taamey Frank CLM": {
66	75	eot: "Hebr/TaameyFrankCLM.eot",
67	76	ttf: "Hebr/TaameyFrankCLM.ttf",
68	77	woff: "Hebr/TaameyFrankCLM.woff",
69		~~- svg: "Hebr/TaameyFrankCLM.svg"~~
	78	+ svg: "Hebr/TaameyFrankCLM.svg",
	79	+ version: "0.110"
70	80	},
71	81
72	82	KhmerOS: {
73	83	eot: "Khmr/KhmerOS.eot",
74	84	ttf: "Khmr/KhmerOS.ttf",
75	85	woff: "Khmr/KhmerOS.woff",
76		~~- svg: "Khmr/KhmerOS.svg"~~
	86	+ svg: "Khmr/KhmerOS.svg",
	87	+ version: "1.10"
77	88	},
78	89
79	90	KhmerOSbattambang: {
80	91	eot: "Khmr/KhmerOSbattambang.eot",
81	92	ttf: "Khmr/KhmerOSbattambang.ttf",
82	93	woff: "Khmr/KhmerOSbattambang.woff",
83		~~- svg: "Khmr/KhmerOSbattambang.svg"~~
	94	+ svg: "Khmr/KhmerOSbattambang.svg",
	95	+ version: "1.10"
84	96	},
85	97
86	98	KhmerOSbokor: {
87	99	eot: "Khmr/KhmerOSbokor.eot",
88	100	ttf: "Khmr/KhmerOSbokor.ttf",
89	101	woff: "Khmr/KhmerOSbokor.woff",
90		~~- svg: "Khmr/KhmerOSbokor.svg"~~
	102	+ svg: "Khmr/KhmerOSbokor.svg",
	103	+ version: "1.10"
91	104	},
92	105
93	106	KhmerOSfreehand: {
94	107	eot: "Khmr/KhmerOSfreehand.eot",
95	108	ttf: "Khmr/KhmerOSfreehand.ttf",
96	109	woff: "Khmr/KhmerOSfreehand.woff",
97		~~- svg: "Khmr/KhmerOSfreehand.svg"~~
	110	+ svg: "Khmr/KhmerOSfreehand.svg",
	111	+ version: "1.10"
98	112	},
99	113
100	114	KhmerOSfasthand: {
101	115	eot: "Khmr/KhmerOSfasthand.eot",
102	116	ttf: "Khmr/KhmerOSfasthand.ttf",
103	117	woff: "Khmr/KhmerOSfasthand.woff",
104		~~- svg: "Khmr/KhmerOSfasthand.svg"~~
	118	+ svg: "Khmr/KhmerOSfasthand.svg",
	119	+ version: "1.10"
105	120	},
106	121
107	122	KhmerOSmuol: {
108	123	eot: "Khmr/KhmerOSmuol.eot",
109	124	ttf: "Khmr/KhmerOSmuol.ttf",
110	125	woff: "Khmr/KhmerOSmuol.woff",
111		~~- svg: "Khmr/KhmerOSmuol.svg"~~
	126	+ svg: "Khmr/KhmerOSmuol.svg",
	127	+ version: "1.10"
112	128	},
113	129
114	130	KhmerOSmuollight: {
115	131	eot: "Khmr/KhmerOSmuollight.eot",
116	132	ttf: "Khmr/KhmerOSmuollight.ttf",
117	133	woff: "Khmr/KhmerOSmuollight.woff",
118		~~- svg: "Khmr/KhmerOSmuollight.svg"~~
	134	+ svg: "Khmr/KhmerOSmuollight.svg",
	135	+ version: "1.10"
119	136	},
120	137
121	138	KhmerOSmuolpali: {
122	139	eot: "Khmr/KhmerOSmuolpali.eot",
123	140	ttf: "Khmr/KhmerOSmuolpali.ttf",
124	141	woff: "Khmr/KhmerOSmuolpali.woff",
125		~~- svg: "Khmr/KhmerOSmuolpali.svg"~~
	142	+ svg: "Khmr/KhmerOSmuolpali.svg",
	143	+ version: "1.10"
126	144	},
127	145
128	146	KhmerOSsiemreap: {
129	147	eot: "Khmr/KhmerOSsiemreap.eot",
130	148	ttf: "Khmr/KhmerOSsiemreap.ttf",
131	149	woff: "Khmr/KhmerOSsiemreap.woff",
132		~~- svg: "Khmr/KhmerOSsiemreap.svg"~~
	150	+ svg: "Khmr/KhmerOSsiemreap.svg",
	151	+ version: "1.10"
133	152	},
134	153
135	154	Kedage: {
136	155	eot: "Knda/Kedage.eot",
137	156	ttf: "Knda/Kedage.ttf",
138		~~- woff: "Knda/Kedage.woff"~~
	157	+ woff: "Knda/Kedage.woff",
	158	+ version: "1.06"
139	159	},
140	160
141	161	"Lohit Kannada": {
142	162	eot: "Knda/Lohit-Kannada.eot",
143	163	ttf: "Knda/Lohit-Kannada.ttf",
144		~~- woff: "Knda/Lohit-Kannada.woff"~~
	164	+ woff: "Knda/Lohit-Kannada.woff",
	165	+ version: "2.5.0"
145	166	},
146	167
147	168	"Charis SIL": {
148	169	eot: "Latn/CharisSIL-R.eot",
149	170	ttf: "Latn/CharisSIL-R.ttf",
150		~~- woff: "Latn/CharisSIL-R.woff"~~
	171	+ woff: "Latn/CharisSIL-R.woff",
	172	+ version: "4.011"
151	173	},
152	174
153	175	Perizia: {
154	176	eot: "Latn/Perizia.eot",
155	177	ttf: "Latn/Perizia.ttf",
156		~~- woff: "Latn/Perizia.woff"~~
	178	+ woff: "Latn/Perizia.woff",
	179	+ version: "0.1"
157	180	},
158	181
159	182	RufScript: {
160	183	eot: "Latn/Rufscript.eot",
161	184	ttf: "Latn/Rufscript.ttf",
162		~~- woff: "Latn/Rufscript.woff"~~
	185	+ woff: "Latn/Rufscript.woff",
	186	+ version: "0.1"
163	187	},
164	188
165	189	Ubuntu: {
166	190	eot: "Latn/ubuntu-r-webfont.eot",
167	191	ttf: "Latn/ubuntu-r.ttf",
168	192	woff: "Latn/ubuntu-r-webfont.woff",
169		~~- svg: "Latn/ubuntu-r-webfont.svg"~~
	193	+ svg: "Latn/ubuntu-r-webfont.svg",
	194	+ version: "0.69"
170	195	},
171	196
172	197	AnjaliOldLipi: {
173	198	eot: "Mlym/AnjaliOldLipi.eot",
174	199	ttf: "Mlym/AnjaliOldLipi.ttf",
175		~~- woff: "Mlym/AnjaliOldLipi.woff"~~
	200	+ woff: "Mlym/AnjaliOldLipi.woff",
	201	+ version: "0.730"
176	202	},
177	203
178	204	Meera: {
—	—	@@ -187,7 +213,8 @@
188	214	"ൿ": "ക്‍ ",
189	215	"ൻ‍റ": "ന്റ",
190	216	"ന്‍റെ": "ന്റെ"
191		~~- }~~
	217	+ },
	218	+ version: "4.5"
192	219	},
193	220
194	221	Rachana: {
—	—	@@ -203,7 +230,8 @@
204	231	"ൿ": "ക്‍ ",
205	232	"ൻ‍റ": "ന്റ",
206	233	"ന്‍റെ": "ന്റെ"
207		~~- }~~
	234	+ },
	235	+ version: "4.5"
208	236	},
209	237
210	238	RaghuMalayalam: {
—	—	@@ -219,89 +247,103 @@
220	248	"ൿ": "ക്‍ ",
221	249	"ൻ‍റ": "ന്റ",
222	250	"ന്‍റെ": "ന്റെ"
223		~~- }~~
	251	+ },
	252	+ version: "2.0"
224	253	},
225	254
226	255	"Masterpiece Uni Sans": {
227	256	eot: "Mymr/MasterpieceUniSans.eot",
228	257	ttf: "Mymr/MasterpieceUniSans.ttf",
229	258	woff: "Mymr/MasterpieceUniSans.woff",
230		~~- svg: "Mymr/MasterpieceUniSans.svg"~~
	259	+ svg: "Mymr/MasterpieceUniSans.svg",
	260	+ version: "0.5"
231	261	},
232	262
233	263	Myanmar3: {
234	264	eot: "Mymr/Myanmar3.eot",
235	265	ttf: "Mymr/Myanmar3.ttf",
236	266	woff: "Mymr/Myanmar3.woff",
237		~~- svg: "Mymr/Myanmar3.svg"~~
	267	+ svg: "Mymr/Myanmar3.svg",
	268	+ version: "3.0"
238	269	},
239	270
240	271	"Padauk-Regular": {
241	272	eot: "Mymr/Padauk-Regular.eot",
242	273	ttf: "Mymr/Padauk-Regular.ttf",
243	274	woff: "Mymr/Padauk-Regular.woff",
244		~~- svg: "Mymr/Padauk-Regular.svg"~~
	275	+ svg: "Mymr/Padauk-Regular.svg",
	276	+ version: "2.8"
245	277	},
246	278
247	279	Yunghkio: {
248	280	eot: "Mymr/Yunghkio.eot",
249	281	ttf: "Mymr/Yunghkio.ttf",
250	282	woff: "Mymr/Yunghkio.woff",
251		~~- svg: "Mymr/Yunghkio.svg"~~
	283	+ svg: "Mymr/Yunghkio.svg",
	284	+ version: "1.0"
252	285	},
253	286
254	287	"Lohit Oriya": {
255	288	eot: "Orya/Lohit-Oriya.eot",
256	289	ttf: "Orya/Lohit-Oriya.ttf",
257		~~- woff: "Orya/Lohit-Oriya.woff"~~
	290	+ woff: "Orya/Lohit-Oriya.woff",
	291	+ version: "2.5.0"
258	292	},
259	293
260	294	Utkal: {
261	295	eot: "Orya/utkal.eot",
262	296	ttf: "Orya/utkal.ttf",
263		~~- woff: "Orya/utkal.woff"~~
	297	+ woff: "Orya/utkal.woff",
	298	+ version: "0.13"
264	299	},
265	300
266	301	Pagul: {
267	302	eot: "Saur/Pagul.eot",
268	303	ttf: "Saur/Pagul.ttf",
269		~~- woff: "Saur/Pagul.woff"~~
	304	+ woff: "Saur/Pagul.woff",
	305	+ version: "1.0"
270	306	},
271	307
272	308	"Lohit Tamil": {
273	309	eot: "Taml/Lohit-Tamil.eot",
274	310	ttf: "Taml/Lohit-Tamil.ttf",
275		~~- woff: "Taml/Lohit-Tamil.woff"~~
	311	+ woff: "Taml/Lohit-Tamil.woff",
	312	+ version: "2.5.0"
276	313	},
277	314
278	315	Thendral: {
279	316	eot: "Taml/ThendralUni.eot",
280	317	ttf: "Taml/ThendralUni.ttf",
281		~~- woff: "Taml/ThendralUni.woff"~~
	318	+ woff: "Taml/ThendralUni.woff",
	319	+ version: "1.0"
282	320	},
283	321
284	322	Thenee: {
285	323	eot: "Taml/TheneeUni.eot",
286	324	ttf: "Taml/TheneeUni.ttf",
287		~~- woff: "Taml/TheneeUni.woff"~~
	325	+ woff: "Taml/TheneeUni.woff",
	326	+ version: "1.0"
288	327	},
289	328
290	329	"Lohit Telugu": {
291	330	eot: "Telu/Lohit-Telugu.eot",
292	331	ttf: "Telu/Lohit-Telugu.ttf",
293		~~- woff: "Telu/Lohit-Telugu.woff"~~
	332	+ woff: "Telu/Lohit-Telugu.woff",
	333	+ version: "2.5.0"
294	334	},
295	335
296	336	"Lohit Punjabi": {
297	337	eot: "Guru/Lohit-Punjabi.eot",
298	338	ttf: "Guru/Lohit-Punjabi.ttf",
299		~~- woff: "Guru/Lohit-Punjabi.woff"~~
	339	+ woff: "Guru/Lohit-Punjabi.woff",
	340	+ version: "2.5.0"
300	341	},
301	342
302	343	"Saab": {
303	344	eot: "Guru/Saab.eot",
304	345	ttf: "Guru/Saab.ttf",
305		~~- woff: "Guru/Saab.woff"~~
	346	+ woff: "Guru/Saab.woff",
	347	+ version: "0.91"
306	348	}
307	349
308	350	},

Status & tagging log

18:27, 3 December 2011 Nikerabbit (talk | contribs) changed the tags for r104662 [removed: i18nreview]
08:18, 2 December 2011 Nikerabbit (talk | contribs) changed the status of r104662 [removed: new added: ok]
09:55, 30 November 2011 Santhosh.thottingal (talk | contribs) changed the tags for r104662 [added: i18nreview]