r61606 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r61605‎ \| r61606 \| r61607 >
Date:	21:12, 27 January 2010
Author:	adam
Status:	deferred
Tags:
Comment:	Namespacing css for wikieditor dialogs in response to Mdale's comment on r61300. Also adding new button styles from Hannes.
Modified paths:	/trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js (modified) (history) /trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/combined.min.css (modified) (history) /trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css (modified) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png (modified) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png (modified) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png (modified) (history) /trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
—	—	@@ -22,18 +22,18 @@
23	23	array( 'src' => 'css/vector.collapsibleNav.css', 'version' => 7 ),
24	24	array( 'src' => 'css/vector.footerCleanup.css', 'version' => 1 ),
25	25	array( 'src' => 'css/wikiEditor.css', 'version' => 8 ),
26		~~- array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 15 ),~~
	26	+ array( 'src' => 'css/wikiEditor.dialogs.css', 'version' => 16 ),
27	27	array( 'src' => 'css/wikiEditor.preview.css', 'version' => 1 ),
28	28	array( 'src' => 'css/wikiEditor.toc.css', 'version' => 28 ),
29	29	array( 'src' => 'css/wikiEditor.toolbar.css', 'version' => 10 ),
30	30	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
31	31	),
32	32	'combined' => array(
33		~~- array( 'src' => 'css/combined.css', 'version' => 58 ),~~
	33	+ array( 'src' => 'css/combined.css', 'version' => 59 ),
34	34	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
35	35	),
36	36	'minified' => array(
37		~~- array( 'src' => 'css/combined.min.css', 'version' => 58 ),~~
	37	+ array( 'src' => 'css/combined.min.css', 'version' => 59 ),
38	38	array( 'src' => 'css/vector/jquery-ui-1.7.2.css', 'version' => '1.7.2y' ),
39	39	),
40	40	)
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_disabled.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_down.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_off.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/images/wikiEditor/dialogs/button_over.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/extensions/UsabilityInitiative/css/wikiEditor.dialogs.css
—	—	@@ -1,37 +1,31 @@
2	2	/* wikiEditor dialogs module */
3	3
4		~~-.ui-widget table {~~
	4	+.wikiEditor-toolbar-dialog table {
5	5	margin-top: 0.75em;
6	6	}
7		~~-.ui-widget table td {~~
	7	+.wikiEditor-toolbar-dialog table td {
8	8	padding: 0.5em;
9	9	height: 3em;
10	10	overflow: visible;
11	11	}
12		-
13		-
14		-
15	12	/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
16	13	div.suggestions {
17	14	z-index: 1099;
18	15	}
19		-
20		~~-.ui-dialog .ui-dialog-titlebar-close:hover {~~
	16	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover {
21	17	text-decoration: none;
22	18	}
23		~~-.ui-dialog-content .status-invalid input {~~
	19	+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input {
24	20	border: 2px solid red;
25	21	padding: 2px 1px;
26	22	}
27		-
28		-
29		~~-.ui-dialog .ui-dialog-titlebar {~~
	23	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar {
30	24	padding: 0.9em 1.4em 0.6em !important;
31	25	}
32		~~-.ui-widget table td {~~
	26	+.wikiEditor-toolbar-dialog table td {
33	27	padding: 0 !important;
34	28	}
35		~~-.ui-dialog .ui-dialog-buttonpane button {~~
	29	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
36	30	-moz-border-radius: 4px;
37	31	-webkit-border-radius: 4px;
38	32	padding: 0.2em 0.6em 0.15em !important;
—	—	@@ -39,54 +33,55 @@
40	34	border: 1px solid #a6a6a6 !important;
41	35	background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
42	36	}
43		~~-.ui-dialog .ui-dialog-buttonpane button:hover {~~
44		~~- background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;~~
	37	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover {
	38	+ border-color: #6e7273;
	39	+ background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
45	40	}
46		~~-.ui-dialog .ui-dialog-buttonpane button:active,~~
47		~~-.ui-dialog .ui-dialog-buttonpane button:focus {~~
48		-
	41	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
	42	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus {
	43	+ border-color: #707271;
49	44	background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
50	45	}
51		~~-.ui-dialog .ui-dialog-buttonpane button.disabled {~~
	46	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled {
52	47	color: #7f7f7f;
53	48	border-color: #cccccc;
54	49	background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
55	50	}
56	51	/* Disables the annoying dashed border Firefox puts on active buttons */
57		~~-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {~~
	52	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
58	53	border: 0;
59	54	}
60		~~-.ui-widget-header {~~
	55	+.wikiEditor-toolbar-dialog .ui-widget-header {
61	56	background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
62	57	}
63	58	/* FIXME: Should just update the icon sprite if we're keeping this X */
64		~~-.ui-icon-closethick {~~
	59	+.wikiEditor-toolbar-dialog .ui-icon-closethick {
65	60	background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
66	61	}
67		~~-.ui-dialog .ui-dialog-buttonpane {~~
	62	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
68	63	margin-top: 0 !important;
69	64	padding:0.3em 1.4em 0.5em 1.4em !important;
70	65	}
71	66
72		~~-.ui-dialog-content fieldset{~~
	67	+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
73	68	border: none !important;
74	69	margin: 0 !important;
75	70	padding: 0 !important;
76	71	}
77		~~-.ui-widget-header {~~
	72	+.wikiEditor-toolbar-dialog .ui-widget-header {
78	73	border-bottom:1px solid #6bc8f3 !important;
79	74	}
80		~~-.ui-dialog-content input[type=text] {~~
	75	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] {
81	76	-moz-box-sizing: border-box;
82	77	-ms-box-sizing: border-box;
83	78	-webkit-box-sizing: border-box;
84	79	-khtml-box-sizing: border-box;
85	80	}
86		~~-.ui-dialog-content input[type="radio"],~~
87		~~-.ui-dialog-content input[type="checkbox"] {~~
	81	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
	82	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] {
88	83	margin-left: 0;
89	84	}
90		~~-body.ltr .ui-dialog .ui-dialog-titlebar-close {~~
	85	+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
91	86	right: 0.9em;
92	87	}
93	88	.wikieditor-toolbar-field-wrapper {
—	—	@@ -116,21 +111,21 @@
117	112	body.rtl #wikieditor-toolbar-table-dialog .wikieditor-toolbar-table-preview-wrapper {
118	113	float: left;
119	114	}
120		~~-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table {~~
	115	+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
121	116	margin-left: 1em;
122	117	margin-right: 0;
123	118	}
124	119	.wikieditor-toolbar-table-preview-content * {
125	120	cursor: default;
126	121	}
127		~~-.ui-widget .wikieditor-toolbar-table-preview-wrapper table {~~
	122	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
128	123	width: 100% !important;
129	124	}
130		~~-.ui-widget .wikieditor-toolbar-table-preview-content table td {~~
	125	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td {
131	126	padding: 10px 4px !important;
132	127	height: auto !important;
133	128	}
134		~~-.ui-widget .wikieditor-toolbar-table-preview-content table th {~~
	129	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th {
135	130	padding: 7px 3px !important;
136	131	}
137	132	.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
—	—	@@ -143,7 +138,7 @@
144	139	margin-right: 0px;
145	140	margin-left: 20px;
146	141	}
147		~~-.ui-dialog .ui-dialog-content {~~
	142	+.wikiEditor-toolbar-dialog .ui-dialog-content {
148	143	padding: 30px 20px 0 !important;
149	144	}
150	145	.wikieditor-toolbar-dialog-wrapper {
—	—	@@ -152,15 +147,15 @@
153	148	/* REPLACE Dialog */
154	149
155	150	/* RTL Changes */
156		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button {~~
	151	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
157	152	float: left;
158	153	margin: 0.5em 0.4em 0.5em 0 !important;
159	154	}
160		~~-body.rtl .ui-dialog .ui-dialog-titlebar-close {~~
	155	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
161	156	left: 0.9em;
162	157	right: auto;
163	158	}
164		~~-body.rtl .ui-dialog .ui-dialog-title {~~
	159	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title {
165	160	float:right;
166	161	}
167	162	/* Self Clearing Floats */
Index: trunk/extensions/UsabilityInitiative/css/combined.css
—	—	@@ -224,38 +224,32 @@
225	225	}
226	226	/* wikiEditor dialogs module */
227	227
228		~~-.ui-widget table {~~
	228	+.wikiEditor-toolbar-dialog table {
229	229	margin-top: 0.75em;
230	230	}
231		~~-.ui-widget table td {~~
	231	+.wikiEditor-toolbar-dialog table td {
232	232	padding: 0.5em;
233	233	height: 3em;
234	234	overflow: visible;
235	235	}
236		-
237		-
238		-
239	236	/* Put suggestions (default z-index 99) on top of dialogs (z-index 1002) */
240	237	div.suggestions {
241	238	z-index: 1099;
242	239	}
243		-
244		~~-.ui-dialog .ui-dialog-titlebar-close:hover {~~
	240	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover {
245	241	text-decoration: none;
246	242	}
247		~~-.ui-dialog-content .status-invalid input {~~
	243	+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input {
248	244	border: 2px solid red;
249	245	padding: 2px 1px;
250	246	}
251		-
252		-
253		~~-.ui-dialog .ui-dialog-titlebar {~~
	247	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar {
254	248	padding: 0.9em 1.4em 0.6em !important;
255	249	}
256		~~-.ui-widget table td {~~
	250	+.wikiEditor-toolbar-dialog table td {
257	251	padding: 0 !important;
258	252	}
259		~~-.ui-dialog .ui-dialog-buttonpane button {~~
	253	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
260	254	-moz-border-radius: 4px;
261	255	-webkit-border-radius: 4px;
262	256	padding: 0.2em 0.6em 0.15em !important;
—	—	@@ -263,54 +257,55 @@
264	258	border: 1px solid #a6a6a6 !important;
265	259	background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
266	260	}
267		~~-.ui-dialog .ui-dialog-buttonpane button:hover {~~
268		~~- background: #ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;~~
	261	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover {
	262	+ border-color: #6e7273;
	263	+ background: #e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
269	264	}
270		~~-.ui-dialog .ui-dialog-buttonpane button:active,~~
271		~~-.ui-dialog .ui-dialog-buttonpane button:focus {~~
272		-
	265	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
	266	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus {
	267	+ border-color: #707271;
273	268	background: #bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
274	269	}
275		~~-.ui-dialog .ui-dialog-buttonpane button.disabled {~~
	270	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled {
276	271	color: #7f7f7f;
277	272	border-color: #cccccc;
278	273	background: #f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
279	274	}
280	275	/* Disables the annoying dashed border Firefox puts on active buttons */
281		~~-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner {~~
	276	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner {
282	277	border: 0;
283	278	}
284		~~-.ui-widget-header {~~
	279	+.wikiEditor-toolbar-dialog .ui-widget-header {
285	280	background: #f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
286	281	}
287	282	/* FIXME: Should just update the icon sprite if we're keeping this X */
288		~~-.ui-icon-closethick {~~
	283	+.wikiEditor-toolbar-dialog .ui-icon-closethick {
289	284	background: url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
290	285	}
291		~~-.ui-dialog .ui-dialog-buttonpane {~~
	286	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane {
292	287	margin-top: 0 !important;
293	288	padding:0.3em 1.4em 0.5em 1.4em !important;
294	289	}
295	290
296		~~-.ui-dialog-content fieldset{~~
	291	+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
297	292	border: none !important;
298	293	margin: 0 !important;
299	294	padding: 0 !important;
300	295	}
301		~~-.ui-widget-header {~~
	296	+.wikiEditor-toolbar-dialog .ui-widget-header {
302	297	border-bottom:1px solid #6bc8f3 !important;
303	298	}
304		~~-.ui-dialog-content input[type=text] {~~
	299	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text] {
305	300	-moz-box-sizing: border-box;
306	301	-ms-box-sizing: border-box;
307	302	-webkit-box-sizing: border-box;
308	303	-khtml-box-sizing: border-box;
309	304	}
310		~~-.ui-dialog-content input[type="radio"],~~
311		~~-.ui-dialog-content input[type="checkbox"] {~~
	305	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
	306	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"] {
312	307	margin-left: 0;
313	308	}
314		~~-body.ltr .ui-dialog .ui-dialog-titlebar-close {~~
	309	+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
315	310	right: 0.9em;
316	311	}
317	312	.wikieditor-toolbar-field-wrapper {
—	—	@@ -340,21 +335,21 @@
341	336	body.rtl #wikieditor-toolbar-table-dialog .wikieditor-toolbar-table-preview-wrapper {
342	337	float: left;
343	338	}
344		~~-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table {~~
	339	+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
345	340	margin-left: 1em;
346	341	margin-right: 0;
347	342	}
348	343	.wikieditor-toolbar-table-preview-content * {
349	344	cursor: default;
350	345	}
351		~~-.ui-widget .wikieditor-toolbar-table-preview-wrapper table {~~
	346	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table {
352	347	width: 100% !important;
353	348	}
354		~~-.ui-widget .wikieditor-toolbar-table-preview-content table td {~~
	349	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td {
355	350	padding: 10px 4px !important;
356	351	height: auto !important;
357	352	}
358		~~-.ui-widget .wikieditor-toolbar-table-preview-content table th {~~
	353	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th {
359	354	padding: 7px 3px !important;
360	355	}
361	356	.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper {
—	—	@@ -367,7 +362,7 @@
368	363	margin-right: 0px;
369	364	margin-left: 20px;
370	365	}
371		~~-.ui-dialog .ui-dialog-content {~~
	366	+.wikiEditor-toolbar-dialog .ui-dialog-content {
372	367	padding: 30px 20px 0 !important;
373	368	}
374	369	.wikieditor-toolbar-dialog-wrapper {
—	—	@@ -376,15 +371,15 @@
377	372	/* REPLACE Dialog */
378	373
379	374	/* RTL Changes */
380		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button {~~
	375	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button {
381	376	float: left;
382	377	margin: 0.5em 0.4em 0.5em 0 !important;
383	378	}
384		~~-body.rtl .ui-dialog .ui-dialog-titlebar-close {~~
	379	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close {
385	380	left: 0.9em;
386	381	right: auto;
387	382	}
388		~~-body.rtl .ui-dialog .ui-dialog-title {~~
	383	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title {
389	384	float:right;
390	385	}
391	386	/* Self Clearing Floats */
Index: trunk/extensions/UsabilityInitiative/css/combined.min.css
—	—	@@ -213,10 +213,10 @@
214	214	.wikiEditor-ui-tabs div.current a:hover{
215	215	text-decoration:none;
216	216	}
217		~~-.ui-widget table{~~
	217	+.wikiEditor-toolbar-dialog table{
218	218	margin-top:0.75em;
219	219	}
220		~~-.ui-widget table td{~~
	220	+.wikiEditor-toolbar-dialog table td{
221	221	padding:0.5em;
222	222	height:3em;
223	223	overflow:visible;
—	—	@@ -224,20 +224,20 @@
225	225	div.suggestions{
226	226	z-index:1099;
227	227	}
228		~~-.ui-dialog .ui-dialog-titlebar-close:hover{~~
	228	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar-close:hover{
229	229	text-decoration:none;
230	230	}
231		~~-.ui-dialog-content .status-invalid input{~~
	231	+.wikiEditor-toolbar-dialog .ui-dialog-content .status-invalid input{
232	232	border:2px solid red;
233	233	padding:2px 1px;
234	234	}
235		~~-.ui-dialog .ui-dialog-titlebar{~~
	235	+.wikiEditor-toolbar-dialog .ui-dialog-titlebar{
236	236	padding:0.9em 1.4em 0.6em !important;
237	237	}
238		~~-.ui-widget table td{~~
	238	+.wikiEditor-toolbar-dialog table td{
239	239	padding:0 !important;
240	240	}
241		~~-.ui-dialog .ui-dialog-buttonpane button{~~
	241	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{
242	242	-moz-border-radius:4px;
243	243	-webkit-border-radius:4px;
244	244	padding:0.2em 0.6em 0.15em !important;
—	—	@@ -245,50 +245,52 @@
246	246	border:1px solid #a6a6a6 !important;
247	247	background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_off.png ) repeat-x scroll 50% 100% !important;
248	248	}
249		~~-.ui-dialog .ui-dialog-buttonpane button:hover{~~
250		~~-background:#ebf2f9 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;~~
	249	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:hover{
	250	+border-color:#6e7273;
	251	+background:#e1e1e1 url( ../images/wikiEditor/dialogs/button_over.png ) repeat-x scroll 50% 100% !important;
251	252	}
252		~~-.ui-dialog .ui-dialog-buttonpane button:active,~~
253		~~-.ui-dialog .ui-dialog-buttonpane button:focus{~~
	253	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:active,
	254	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button:focus{
	255	+border-color:#707271;
254	256	background:#bfbfbf url( ../images/wikiEditor/dialogs/button_down.png ) repeat-x scroll 50% 100% !important;
255	257	}
256		~~-.ui-dialog .ui-dialog-buttonpane button.disabled{~~
	258	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button.disabled{
257	259	color:#7f7f7f;
258	260	border-color:#cccccc;
259	261	background:#f2f2f2 url( ../images/wikiEditor/dialogs/button_disabled.png ) repeat-x scroll 50% 100% !important;
260	262	}
261		~~-.ui-dialog .ui-dialog-buttonpane button::-moz-focus-inner{~~
	263	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane button::-moz-focus-inner{
262	264	border:0;
263	265	}
264		~~-.ui-widget-header{~~
	266	+.wikiEditor-toolbar-dialog .ui-widget-header{
265	267	background:#f0f0f0 url( ../images/wikiEditor/dialogs/titlebar_fade.png ) repeat-x scroll 50% 100% !important;
266	268	}
267		~~-.ui-icon-closethick{~~
	269	+.wikiEditor-toolbar-dialog .ui-icon-closethick{
268	270	background:url( ../images/wikiEditor/dialogs/close_x.png ) no-repeat 50% 50% !important;
269	271	}
270		~~-.ui-dialog .ui-dialog-buttonpane{~~
	272	+.wikiEditor-toolbar-dialog .ui-dialog-buttonpane{
271	273	margin-top:0 !important;
272	274	padding:0.3em 1.4em 0.5em 1.4em !important;
273	275	}
274		~~-.ui-dialog-content fieldset{~~
	276	+.wikiEditor-toolbar-dialog .ui-dialog-content fieldset{
275	277	border:none !important;
276	278	margin:0 !important;
277	279	padding:0 !important;
278	280	}
279		~~-.ui-widget-header{~~
	281	+.wikiEditor-toolbar-dialog .ui-widget-header{
280	282	border-bottom:1px solid #6bc8f3 !important;
281	283	}
282		~~-.ui-dialog-content input[type=text]{~~
	284	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type=text]{
283	285	-moz-box-sizing:border-box;
284	286	-ms-box-sizing:border-box;
285	287	-webkit-box-sizing:border-box;
286	288	-khtml-box-sizing:border-box;
287	289	}
288		~~-.ui-dialog-content input[type="radio"],~~
289		~~-.ui-dialog-content input[type="checkbox"]{~~
	290	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="radio"],
	291	+.wikiEditor-toolbar-dialog .ui-dialog-content input[type="checkbox"]{
290	292	margin-left:0;
291	293	}
292		~~-body.ltr .ui-dialog .ui-dialog-titlebar-close{~~
	294	+body.ltr .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close{
293	295	right:0.9em;
294	296	}
295	297	.wikieditor-toolbar-field-wrapper{
—	—	@@ -316,21 +318,21 @@
317	319	body.rtl #wikieditor-toolbar-table-dialog .wikieditor-toolbar-table-preview-wrapper{
318	320	float:left;
319	321	}
320		~~-body.rtl .ui-widget .wikieditor-toolbar-table-preview-wrapper table{~~
	322	+body.rtl .wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table{
321	323	margin-left:1em;
322	324	margin-right:0;
323	325	}
324	326	.wikieditor-toolbar-table-preview-content *{
325	327	cursor:default;
326	328	}
327		~~-.ui-widget .wikieditor-toolbar-table-preview-wrapper table{~~
	329	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-wrapper table{
328	330	width:100% !important;
329	331	}
330		~~-.ui-widget .wikieditor-toolbar-table-preview-content table td{~~
	332	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table td{
331	333	padding:10px 4px !important;
332	334	height:auto !important;
333	335	}
334		~~-.ui-widget .wikieditor-toolbar-table-preview-content table th{~~
	336	+.wikiEditor-toolbar-dialog .wikieditor-toolbar-table-preview-content table th{
335	337	padding:7px 3px !important;
336	338	}
337	339	.wikieditor-toolbar-table-dimension-fields .wikieditor-toolbar-field-wrapper{
—	—	@@ -343,21 +345,21 @@
344	346	margin-right:0px;
345	347	margin-left:20px;
346	348	}
347		~~-.ui-dialog .ui-dialog-content{~~
	349	+.wikiEditor-toolbar-dialog .ui-dialog-content{
348	350	padding:30px 20px 0 !important;
349	351	}
350	352	.wikieditor-toolbar-dialog-wrapper{
351	353	width:100%;
352	354	}
353		~~-body.rtl .ui-dialog .ui-dialog-buttonpane button{~~
	355	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-buttonpane button{
354	356	float:left;
355	357	margin:0.5em 0.4em 0.5em 0 !important;
356	358	}
357		~~-body.rtl .ui-dialog .ui-dialog-titlebar-close{~~
	359	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-titlebar-close{
358	360	left:0.9em;
359	361	right:auto;
360	362	}
361		~~-body.rtl .ui-dialog .ui-dialog-title{~~
	363	+body.rtl .wikiEditor-toolbar-dialog .ui-dialog-title{
362	364	float:right;
363	365	}
364	366	.wikieditor-toolbar-table-dimension-fields:after,
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.hooks.php
—	—	@@ -16,14 +16,14 @@
17	17	array( 'src' => 'Modules/Preview/Preview.js', 'version' => 6 ),
18	18	array( 'src' => 'Modules/Publish/Publish.js', 'version' => 6 ),
19	19	array( 'src' => 'Modules/Toc/Toc.js', 'version' => 7 ),
20		~~- array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 37 ),~~
	20	+ array( 'src' => 'Modules/Toolbar/Toolbar.js', 'version' => 38 ),
21	21	array( 'src' => 'Modules/TemplateEditor/TemplateEditor.js', 'version' => 4 ),
22	22	),
23	23	'combined' => array(
24		~~- array( 'src' => 'WikiEditor.combined.js', 'version' => 39 ),~~
	24	+ array( 'src' => 'WikiEditor.combined.js', 'version' => 40 ),
25	25	),
26	26	'minified' => array(
27		~~- array( 'src' => 'WikiEditor.combined.min.js', 'version' => 39 ),~~
	27	+ array( 'src' => 'WikiEditor.combined.min.js', 'version' => 40 ),
28	28	),
29	29	);
30	30	static $messages = array(
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.js
—	—	@@ -1173,6 +1173,7 @@
1174	1174	},
1175	1175	dialog: {
1176	1176	width: 500,
	1177	+ dialogClass: 'wikiEditor-toolbar-dialog',
1177	1178	buttons: {
1178	1179	'wikieditor-toolbar-tool-link-insert': function() {
1179	1180	function escapeInternalText( s ) {
—	—	@@ -1450,6 +1451,7 @@
1451	1452	},
1452	1453	dialog: {
1453	1454	resizable: false,
	1455	+ dialogClass: 'wikiEditor-toolbar-dialog',
1454	1456	width: 590,
1455	1457	buttons: {
1456	1458	'wikieditor-toolbar-tool-table-insert': function() {
—	—	@@ -1682,6 +1684,7 @@
1683	1685	},
1684	1686	dialog: {
1685	1687	width: 500,
	1688	+ dialogClass: 'wikiEditor-toolbar-dialog',
1686	1689	buttons: {
1687	1690	'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {
1688	1691	$j(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target );
Index: trunk/extensions/UsabilityInitiative/WikiEditor/WikiEditor.combined.min.js
—	—	@@ -51,7 +51,7 @@
52	52	updateExistence();});$j('#wikieditor-toolbar-link-int-target').data('suggcache',{}).suggestions({fetch:function(query){var that=this;var title=$j(this).val();if(isExternalLink(title)\|\|title.indexOf('\|')!=-1\|\|title==''){$j(this).suggestions('suggestions',[]);return;}
53	53	var cache=$j(this).data('suggcache');if(typeof cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
54	54	var request=$j.ajax({url:wgScriptPath+'/api.php',data:{'action':'opensearch','search':title,'namespace':0,'suggest':'','format':'json'},dataType:'json',success:function(data){cache[title]=data[1];$j(that).suggestions('suggestions',data[1]);}});$j(this).data('request',request);},cancel:function(){var request=$j(this).data('request');if(request)
55		~~-request.abort();}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-link-insert':function(){function escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}~~
	55	+request.abort();}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-link-insert':function(){function escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
56	56	function escapeExternalTarget(s){return s.replace(/ /g,'%20').replace(/]/g,'%5D');}
57	57	function escapeExternalText(s){return s.replace(/(]+)/g,'<nowiki>$1</nowiki>');}
58	58	var insertText='';var whitespace=$j('#wikieditor-toolbar-link-dialog').data('whitespace');var target=$j('#wikieditor-toolbar-link-int-target').val();var text=$j('#wikieditor-toolbar-link-int-text').val();var u=mw.usability;if(target==''){alert(u.getMsg('wikieditor-toolbar-tool-link-empty'));return;}
—	—	@@ -129,7 +129,7 @@
130	130	</div>\
131	131	</div></div>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(mw.usability.getMsg($j(this).attr('rel')));});$j('#wikieditor-toolbar-table-dimensions-rows').val(4);$j('#wikieditor-toolbar-table-dimensions-columns').val(3);$j('#wikieditor-toolbar-table-wikitable').click(function(){$j('.wikieditor-toolbar-table-preview').toggleClass('wikitable');});$j('#wikieditor-toolbar-table-preview').clone().attr('id','wikieditor-toolbar-table-preview2').addClass('sortable').insertAfter($j('#wikieditor-toolbar-table-preview')).hide();if(typeof ts_makeSortable=='function')
132	132	ts_makeSortable($j('#wikieditor-toolbar-table-preview2').get(0));$j('#wikieditor-toolbar-table-sortable').click(function(){$j('#wikieditor-toolbar-table-preview').hide().attr('id','wikieditor-toolbar-table-preview3');$j('#wikieditor-toolbar-table-preview2').attr('id','wikieditor-toolbar-table-preview').show();$j('#wikieditor-toolbar-table-preview3').attr('id','wikieditor-toolbar-table-preview2');});$j('#wikieditor-toolbar-table-dimensions-header').click(function(){var headerHTML=$j('.wikieditor-toolbar-table-preview-header').html();var hiddenHTML=$j('.wikieditor-toolbar-table-preview-hidden').html();$j('.wikieditor-toolbar-table-preview-header').html(hiddenHTML);$j('.wikieditor-toolbar-table-preview-hidden').html(headerHTML);if(typeof ts_makeSortable=='function')
133		-ts_makeSortable($j('#wikieditor-toolbar-table-preview, #wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,width:590,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());var u=mw.usability;if(isNaN(rows)\|\|isNaN(cols)\|\|rows!=rowsVal\|\|cols!=colsVal){alert(u.getMsg('wikieditor-toolbar-tool-table-invalidnumber'));return;}
	133	+ts_makeSortable($j('#wikieditor-toolbar-table-preview, #wikieditor-toolbar-table-preview2').filter('.sortable').get(0));});},dialog:{resizable:false,dialogClass:'wikiEditor-toolbar-dialog',width:590,buttons:{'wikieditor-toolbar-tool-table-insert':function(){var rowsVal=$j('#wikieditor-toolbar-table-dimensions-rows').val();var colsVal=$j('#wikieditor-toolbar-table-dimensions-columns').val();var rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var header=Math.min(1,$j('#wikieditor-toolbar-table-dimensions-header:checked').size());var u=mw.usability;if(isNaN(rows)\|\|isNaN(cols)\|\|rows!=rowsVal\|\|cols!=colsVal){alert(u.getMsg('wikieditor-toolbar-tool-table-invalidnumber'));return;}
134	134	if(rows+header==0\|\|cols==0){alert(u.getMsg('wikieditor-toolbar-tool-table-zero'));return;}
135	135	if(rows*cols>1000){alert(u.getMsg('wikieditor-toolbar-tool-table-toomany',1000));return;}
136	136	var headerText=u.getMsg('wikieditor-toolbar-tool-table-example-header');var normalText=u.getMsg('wikieditor-toolbar-tool-table-example');var table="";for(var r=0;r<rows+header;r++){table+="\|-\n";for(var c=0;c<cols;c++){var isHeader=(r+1==header);var delim=isHeader?'!':'\|';if(c>0){delim+=delim;}
—	—	@@ -174,6 +174,6 @@
175	175	if(!match){$j('#wikieditor-toolbar-replace-nomatch').show();}else if(mode=='replaceAll'){var index;for(var i=0;i<match.length;i++){index=s.indexOf(match[i]);if(index==-1){break;}
176	176	s=s.substr(index+match[i].length);var start=index+offset;var end=start+match[i].length;var newEnd=start+replaceStr.length;$textarea.textSelection('setSelection',{'start':start,'end':end}).textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});offset=newEnd;}
177	177	$j('#wikieditor-toolbar-replace-success').text(u.getMsg('wikieditor-toolbar-tool-replace-success',match.length)).show();$j(this).data('offset',0);}else{var start=match.index+offset;var end=start+match[0].length;var newEnd=start+replaceStr.length;$textarea.textSelection('setSelection',{'start':start,'end':end});if(mode=='replace'){$textarea.textSelection('encapsulateSelection',{'peri':replaceStr,'replace':true}).textSelection('setSelection',{'start':start,'end':newEnd});}
178		-$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{width:500,buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode\|\|e.which)==13){var button=$j(this).data('dialogaction')\|\|$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
	178	+$textarea.textSelection('scrollToCaretPosition');$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{width:500,dialogClass:'wikiEditor-toolbar-dialog',buttons:{'wikieditor-toolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'wikieditor-toolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'wikieditor-toolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'wikieditor-toolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#wikieditor-toolbar-replace-search').focus();$j('#wikieditor-toolbar-replace-nomatch, #wikieditor-toolbar-replace-success, #wikieditor-toolbar-replace-emptysearch, #wikieditor-toolbar-replace-invalidregex').hide();if(!($j(this).data('onetimeonlystuff'))){$j(this).data('onetimeonlystuff',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode\|\|e.which)==13){var button=$j(this).data('dialogaction')\|\|$j(this).find('button:first');button.click();e.preventDefault();}});$j(this).closest('.ui-dialog').find('button').focus(function(){$j(this).closest('.ui-dialog').data('dialogaction',this);});}
179	179	var dialog=$j(this).closest('.ui-dialog');var that=this;$j($j(this).data('context').$iframe[0].contentWindow.document).bind('keypress.srdialog',function(e){if((e.keyCode\|\|e.which)==13){var button=dialog.data('dialogaction')\|\|dialog.find('button:first');button.click();e.preventDefault();}else if((e.keyCode\|\|e.which)==27){$j(that).dialog('close');}});},close:function(){$j($j(this).data('context').$iframe[0].contentWindow.document).unbind('keypress.srdialog');$j(this).data('context').$iframe[0].contentWindow.focus();$j(this).closest('.ui-dialog').data('dialogaction',false);}}}}});}});$j(document).ready(function(){if(!wgWikiEditorEnabledModules.templateEditor){return true;}
180	180	if($j.fn.wikiEditor){$j('textarea#wpTextbox1').wikiEditor('addModule','templateEditor');}});
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/WikiEditor/Modules/Toolbar/Toolbar.js
—	—	@@ -1124,6 +1124,7 @@
1125	1125	},
1126	1126	dialog: {
1127	1127	width: 500,
	1128	+ dialogClass: 'wikiEditor-toolbar-dialog',
1128	1129	buttons: {
1129	1130	'wikieditor-toolbar-tool-link-insert': function() {
1130	1131	function escapeInternalText( s ) {
—	—	@@ -1401,6 +1402,7 @@
1402	1403	},
1403	1404	dialog: {
1404	1405	resizable: false,
	1406	+ dialogClass: 'wikiEditor-toolbar-dialog',
1405	1407	width: 590,
1406	1408	buttons: {
1407	1409	'wikieditor-toolbar-tool-table-insert': function() {
—	—	@@ -1633,6 +1635,7 @@
1634	1636	},
1635	1637	dialog: {
1636	1638	width: 500,
	1639	+ dialogClass: 'wikiEditor-toolbar-dialog',
1637	1640	buttons: {
1638	1641	'wikieditor-toolbar-tool-replace-button-findnext': function( e ) {
1639	1642	$j(this).closest( '.ui-dialog' ).data( 'dialogaction', e.target );

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r61300	More dialog changes. TODO - Help IE7 with the table based dialogs	adam	18:24, 20 January 2010

Status & tagging log

11:10, 22 February 2010 Tim Starling (talk | contribs) changed the status of r61606 [removed: new added: deferred]