r102725 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r102724‎ \| r102725 \| r102726 >
Date:	00:17, 11 November 2011
Author:	krinkle
Status:	ok
Tags:
Comment:	[Resources.php] Must. Have. Order.
Modified paths:	/trunk/phase3/resources/Resources.php (modified) (history)

Diff [purge]

Index: trunk/phase3/resources/Resources.php
—	—	@@ -15,14 +15,21 @@
16	16
17	17	/* Skins */
18	18
19		~~- 'skins.vector' => array(~~
	19	+ 'skins.chick' => array(
	20	+ 'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),
	21	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	22	+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
	23	+ ),
	24	+ 'skins.cologneblue' => array(
	25	+ 'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),
	26	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	27	+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
	28	+ ),
	29	+ 'skins.modern' => array(
20	30	'styles' => array(
21		~~- 'common/commonElements.css' => array( 'media' => 'screen' ),~~
22		~~- 'common/commonContent.css' => array( 'media' => 'screen' ),~~
23		~~- 'common/commonInterface.css' => array( 'media' => 'screen' ),~~
24		~~- 'vector/screen.css' => array( 'media' => 'screen' ),~~
	31	+ 'modern/main.css' => array( 'media' => 'screen' ),
	32	+ 'modern/print.css' => array( 'media' => 'print' ),
25	33	),
26		~~- 'scripts' => 'vector/vector.js',~~
27	34	'remoteBasePath' => $GLOBALS['wgStylePath'],
28	35	'localBasePath' => $GLOBALS['wgStyleDirectory'],
29	36	),
—	—	@@ -36,39 +43,32 @@
37	44	'remoteBasePath' => $GLOBALS['wgStylePath'],
38	45	'localBasePath' => $GLOBALS['wgStyleDirectory'],
39	46	),
	47	+ 'skins.nostalgia' => array(
	48	+ 'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ),
	49	+ 'remoteBasePath' => $GLOBALS['wgStylePath'],
	50	+ 'localBasePath' => $GLOBALS['wgStyleDirectory'],
	51	+ ),
40	52	'skins.simple' => array(
41	53	'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ),
42	54	'remoteBasePath' => $GLOBALS['wgStylePath'],
43	55	'localBasePath' => $GLOBALS['wgStyleDirectory'],
44	56	),
45		~~- 'skins.chick' => array(~~
46		~~- 'styles' => array( 'chick/main.css' => array( 'media' => 'screen,handheld' ) ),~~
	57	+ 'skins.standard' => array(
	58	+ 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),
47	59	'remoteBasePath' => $GLOBALS['wgStylePath'],
48	60	'localBasePath' => $GLOBALS['wgStyleDirectory'],
49	61	),
50		~~- 'skins.modern' => array(~~
	62	+ 'skins.vector' => array(
51	63	'styles' => array(
52		~~- 'modern/main.css' => array( 'media' => 'screen' ),~~
53		~~- 'modern/print.css' => array( 'media' => 'print' ),~~
	64	+ 'common/commonElements.css' => array( 'media' => 'screen' ),
	65	+ 'common/commonContent.css' => array( 'media' => 'screen' ),
	66	+ 'common/commonInterface.css' => array( 'media' => 'screen' ),
	67	+ 'vector/screen.css' => array( 'media' => 'screen' ),
54	68	),
	69	+ 'scripts' => 'vector/vector.js',
55	70	'remoteBasePath' => $GLOBALS['wgStylePath'],
56	71	'localBasePath' => $GLOBALS['wgStyleDirectory'],
57	72	),
58		~~- 'skins.cologneblue' => array(~~
59		~~- 'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ),~~
60		~~- 'remoteBasePath' => $GLOBALS['wgStylePath'],~~
61		~~- 'localBasePath' => $GLOBALS['wgStyleDirectory'],~~
62		~~- ),~~
63		~~- 'skins.nostalgia' => array(~~
64		~~- 'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ),~~
65		~~- 'remoteBasePath' => $GLOBALS['wgStylePath'],~~
66		~~- 'localBasePath' => $GLOBALS['wgStyleDirectory'],~~
67		~~- ),~~
68		~~- 'skins.standard' => array(~~
69		~~- 'styles' => array( 'common/wikistandard.css' => array( 'media' => 'screen' ) ),~~
70		~~- 'remoteBasePath' => $GLOBALS['wgStylePath'],~~
71		~~- 'localBasePath' => $GLOBALS['wgStyleDirectory'],~~
72		~~- ),~~
73	73
74	74	/* jQuery */
75	75
—	—	@@ -79,12 +79,12 @@
80	80
81	81	/* jQuery Plugins */
82	82
	83	+ 'jquery.appear' => array(
	84	+ 'scripts' => 'resources/jquery/jquery.appear.js',
	85	+ ),
83	86	'jquery.async' => array(
84	87	'scripts' => 'resources/jquery/jquery.async.js',
85	88	),
86		~~- 'jquery.appear' => array(~~
87		~~- 'scripts' => 'resources/jquery/jquery.appear.js',~~
88		~~- ),~~
89	89	'jquery.autoEllipsis' => array(
90	90	'scripts' => 'resources/jquery/jquery.autoEllipsis.js',
91	91	'dependencies' => 'jquery.highlightText',
—	—	@@ -105,13 +105,13 @@
106	106	'jquery.collapsibleTabs' => array(
107	107	'scripts' => 'resources/jquery/jquery.collapsibleTabs.js',
108	108	),
109		~~- 'jquery.colorUtil' => array(~~
110		~~- 'scripts' => 'resources/jquery/jquery.colorUtil.js',~~
111		~~- ),~~
112	109	'jquery.color' => array(
113	110	'scripts' => 'resources/jquery/jquery.color.js',
114	111	'dependencies' => 'jquery.colorUtil',
115	112	),
	113	+ 'jquery.colorUtil' => array(
	114	+ 'scripts' => 'resources/jquery/jquery.colorUtil.js',
	115	+ ),
116	116	'jquery.cookie' => array(
117	117	'scripts' => 'resources/jquery/jquery.cookie.js',
118	118	),
—	—	@@ -139,13 +139,6 @@
140	140	'jquery.hoverIntent' => array(
141	141	'scripts' => 'resources/jquery/jquery.hoverIntent.js',
142	142	),
143		~~- 'jquery.messageBox' => array(~~
144		~~- 'scripts' => 'resources/jquery/jquery.messageBox.js',~~
145		~~- 'styles' => 'resources/jquery/jquery.messageBox.css',~~
146		~~- ),~~
147		~~- 'jquery.placeholder' => array(~~
148		~~- 'scripts' => 'resources/jquery/jquery.placeholder.js',~~
149		~~- ),~~
150	143	'jquery.json' => array(
151	144	'scripts' => 'resources/jquery/jquery.json.js',
152	145	),
—	—	@@ -157,24 +150,31 @@
158	151	'styles' => 'resources/jquery/jquery.makeCollapsible.css',
159	152	'messages' => array( 'collapsible-expand', 'collapsible-collapse' ),
160	153	),
	154	+ 'jquery.messageBox' => array(
	155	+ 'scripts' => 'resources/jquery/jquery.messageBox.js',
	156	+ 'styles' => 'resources/jquery/jquery.messageBox.css',
	157	+ ),
161	158	'jquery.mockjax' => array(
162	159	'scripts' => 'resources/jquery/jquery.mockjax.js',
163	160	),
	161	+ 'jquery.mw-jump' => array(
	162	+ 'scripts' => 'resources/jquery/jquery.mw-jump.js',
	163	+ ),
164	164	'jquery.mwExtension' => array(
165	165	'scripts' => 'resources/jquery/jquery.mwExtension.js',
166	166	),
167		~~- 'jquery.mw-jump' => array(~~
168		~~- 'scripts' => 'resources/jquery/jquery.mw-jump.js',~~
	167	+ 'jquery.placeholder' => array(
	168	+ 'scripts' => 'resources/jquery/jquery.placeholder.js',
169	169	),
	170	+ 'jquery.qunit.completenessTest' => array(
	171	+ 'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js',
	172	+ 'dependencies' => 'jquery.qunit',
	173	+ ),
170	174	'jquery.qunit' => array(
171	175	'scripts' => 'resources/jquery/jquery.qunit.js',
172	176	'styles' => 'resources/jquery/jquery.qunit.css',
173	177	'position' => 'top',
174	178	),
175		~~- 'jquery.qunit.completenessTest' => array(~~
176		~~- 'scripts' => 'resources/jquery/jquery.qunit.completenessTest.js',~~
177		~~- 'dependencies' => 'jquery.qunit',~~
178		~~- ),~~
179	179	'jquery.spinner' => array(
180	180	'scripts' => 'resources/jquery/jquery.spinner.js',
181	181	'styles' => 'resources/jquery/jquery.spinner.css',
—	—	@@ -505,6 +505,15 @@
506	506	'jquery.cookie',
507	507	),
508	508	),
	509	+ 'mediawiki.util' => array(
	510	+ 'scripts' => 'resources/mediawiki/mediawiki.util.js',
	511	+ 'dependencies' => array(
	512	+ 'jquery.client',
	513	+ 'jquery.cookie',
	514	+ 'jquery.messageBox',
	515	+ 'jquery.mwExtension',
	516	+ ),
	517	+ ),
509	518
510	519	/* MediaWiki Action */
511	520
—	—	@@ -614,15 +623,6 @@
615	624
616	625	/* MediaWiki Page */
617	626
618		~~- 'mediawiki.util' => array(~~
619		~~- 'scripts' => 'resources/mediawiki/mediawiki.util.js',~~
620		~~- 'dependencies' => array(~~
621		~~- 'jquery.client',~~
622		~~- 'jquery.cookie',~~
623		~~- 'jquery.messageBox',~~
624		~~- 'jquery.mwExtension',~~
625		~~- ),~~
626		~~- ),~~
627	627	'mediawiki.page.ready' => array(
628	628	'scripts' => 'resources/mediawiki.page/mediawiki.page.ready.js',
629	629	'dependencies' => array(
—	—	@@ -648,34 +648,34 @@
649	649	'scripts' => 'resources/mediawiki.special/mediawiki.special.js',
650	650	'styles' => 'resources/mediawiki.special/mediawiki.special.css',
651	651	),
652		~~- 'mediawiki.special.preferences' => array(~~
653		~~- 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',~~
654		~~- 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',~~
655		~~- 'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),~~
	652	+ 'mediawiki.special.block' => array(
	653	+ 'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',
656	654	),
657	655	'mediawiki.special.changeslist' => array(
658	656	'styles' => 'resources/mediawiki.special/mediawiki.special.changeslist.css',
659	657	'dependencies' => array( 'jquery.makeCollapsible' ),
660	658	),
661		~~- 'mediawiki.special.search' => array(~~
662		~~- 'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',~~
663		~~- 'styles' => 'resources/mediawiki.special/mediawiki.special.search.css',~~
664		~~- ),~~
665		~~- 'mediawiki.special.block' => array(~~
666		~~- 'scripts' => 'resources/mediawiki.special/mediawiki.special.block.js',~~
667		~~- ),~~
668		~~- 'mediawiki.special.undelete' => array(~~
669		~~- 'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js',~~
670		~~- ),~~
671	659	'mediawiki.special.movePage' => array(
672	660	'scripts' => 'resources/mediawiki.special/mediawiki.special.movePage.js',
673	661	'dependencies' => 'jquery.byteLimit',
674	662	),
	663	+ 'mediawiki.special.preferences' => array(
	664	+ 'scripts' => 'resources/mediawiki.special/mediawiki.special.preferences.js',
	665	+ 'styles' => 'resources/mediawiki.special/mediawiki.special.preferences.css',
	666	+ 'messages' => array( 'email-address-validity-valid', 'email-address-validity-invalid' ),
	667	+ ),
675	668	'mediawiki.special.recentchanges' => array(
676	669	'scripts' => 'resources/mediawiki.special/mediawiki.special.recentchanges.js',
677	670	'dependencies' => array( 'mediawiki.special' ),
678	671	'position' => 'top',
679	672	),
	673	+ 'mediawiki.special.search' => array(
	674	+ 'scripts' => 'resources/mediawiki.special/mediawiki.special.search.js',
	675	+ 'styles' => 'resources/mediawiki.special/mediawiki.special.search.css',
	676	+ ),
	677	+ 'mediawiki.special.undelete' => array(
	678	+ 'scripts' => 'resources/mediawiki.special/mediawiki.special.undelete.js',
	679	+ ),
680	680	'mediawiki.special.upload' => array(
681	681	// @TODO: merge in remainder of mediawiki.legacy.upload
682	682	'scripts' => 'resources/mediawiki.special/mediawiki.special.upload.js',

Status & tagging log

12:49, 14 November 2011 Reedy (talk | contribs) changed the status of r102725 [removed: new added: ok]