r57985 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r57984‎ | r57985 | r57986 >
Date:18:31, 21 October 2009
Author:catrope
Status:deferred
Tags:
Comment:
UsabilityInitiative: Add support for modules to minify and/or combine their JS, and do this for EditToolbar.js
Modified paths:
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php (modified) (history)
  • /trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js (added) (history)
  • /trunk/extensions/UsabilityInitiative/Makefile (modified) (history)
  • /trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php (modified) (history)

Diff [purge]

Index: trunk/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
——@@ -40,6 +40,11 @@
4141 'tests' => array(
4242 array( 'src' => 'js/tests/wikiEditor.toolbar.js', 'version' => 0 )
4343 ),
 44+ 'modules' => array(
 45+ 'raw' => array(),
 46+ 'combined' => array(),
 47+ 'minfied' => array()
 48+ ),
4449 // Code to include when js2 is not present
4550 'no_js2' => array(
4651 'raw' => array(
——@@ -83,38 +88,6 @@
8489 /* Static Functions */
8590
8691 public static function initialize() {
87 - global $wgUsabilityInitiativeResourceMode;
88 - global $wgEnableJS2system, $wgEditToolbarRunTests;
89 -
90 - // Only do this the first time!
91 - if ( !self::$doOutput ) {
92 - // Default to raw
93 - $mode = $wgUsabilityInitiativeResourceMode; // Just an alias
94 - if ( !isset( self::$scriptFiles['base_sets'][$mode] ) ) {
95 - $mode = 'raw';
96 - }
97 - // Provide enough support to make things work, even when js2 is not
98 - // in use (eventually it will be standard, but right now it's not)
99 - if ( !$wgEnableJS2system ) {
100 - self::$scripts = array_merge(
101 - self::$scripts, self::$scriptFiles['no_js2'][$mode]
102 - );
103 - }
104 - // Inlcude base-set of scripts
105 - self::$scripts = array_merge(
106 - self::$scripts, self::$scriptFiles['base_sets'][$mode]
107 - );
108 - // Inlcude base-set of styles
109 - self::$styles = array_merge(
110 - self::$styles, self::$styleFiles['base_sets'][$mode]
111 - );
112 - if ( $wgEditToolbarRunTests ) {
113 - // Include client side tests
114 - self::$scripts = array_merge(
115 - self::$scripts, self::$scriptFiles['tests']
116 - );
117 - }
118 - }
11992 self::$doOutput = true;
12093 }
12194
——@@ -124,10 +97,40 @@
12598 */
12699 public static function addResources( $out ) {
127100 global $wgScriptPath, $wgJsMimeType;
 101+ global $wgUsabilityInitiativeResourceMode;
 102+ global $wgEnableJS2system, $wgEditToolbarRunTests;
128103
129104 if ( !self::$doOutput )
130105 return true;
131106
 107+ // Default to raw
 108+ $mode = $wgUsabilityInitiativeResourceMode; // Just an alias
 109+ if ( !isset( self::$scriptFiles['base_sets'][$mode] ) ) {
 110+ $mode = 'raw';
 111+ }
 112+ // Include base-set of scripts
 113+ self::$scripts = array_merge(
 114+ self::$scriptFiles['base_sets'][$mode],
 115+ self::$scriptFiles['modules'][$mode],
 116+ self::$scripts
 117+ );
 118+ // Provide enough support to make things work, even when js2 is not
 119+ // in use (eventually it will be standard, but right now it's not)
 120+ if ( !$wgEnableJS2system ) {
 121+ self::$scripts = array_merge(
 122+ self::$scriptFiles['no_js2'][$mode], self::$scripts
 123+ );
 124+ }
 125+ // Include base-set of styles
 126+ self::$styles = array_merge(
 127+ self::$styleFiles['base_sets'][$mode], self::$styles
 128+ );
 129+ if ( $wgEditToolbarRunTests ) {
 130+ // Include client side tests
 131+ self::$scripts = array_merge(
 132+ self::$scripts, self::$scriptFiles['tests']
 133+ );
 134+ }
132135 // Loops over each script
133136 foreach ( self::$scripts as $script ) {
134137 // Add javascript to document
——@@ -220,4 +223,13 @@
221224 public static function addVariables( $variables ) {
222225 self::$variables = array_merge( self::$variables, $variables );
223226 }
 227+
 228+ /**
 229+ * Adds scripts for modules
 230+ * @param $scripts array with 'raw', 'combined' and 'minified' keys
 231+ */
 232+ public static function addModuleScripts( $scripts ) {
 233+ self::$scriptFiles['modules'] = array_merge(
 234+ self::$scriptFiles['modules'], $scripts );
 235+ }
224236 }
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
——@@ -24,9 +24,26 @@
2525 // Add JS and CSS
2626 global $wgEditToolbarStyleVersion;
2727 UsabilityInitiativeHooks::initialize();
28 - UsabilityInitiativeHooks::addScript(
29 - 'EditToolbar/EditToolbar.js', $wgEditToolbarStyleVersion
30 - );
 28+ UsabilityInitiativeHooks::addModuleScripts( array(
 29+ 'raw' => array(
 30+ array(
 31+ 'src' => 'EditToolbar/EditToolbar.js',
 32+ 'version' => $wgEditToolbarStyleVersion
 33+ )
 34+ ),
 35+ 'combined' => array(
 36+ array(
 37+ 'src' => 'EditToolbar/EditToolbar.js',
 38+ 'version' => $wgEditToolbarStyleVersion
 39+ )
 40+ ),
 41+ 'minified' => array(
 42+ array(
 43+ 'src' => 'EditToolbar/EditToolbar.min.js',
 44+ 'version' => $wgEditToolbarStyleVersion
 45+ )
 46+ )
 47+ ) );
3148 UsabilityInitiativeHooks::addVariables( array(
3249 'wgEditToolbarCGD' => $wgEditToolbarCGDGlobalEnable || ( $wgEditToolbarCGDUserEnable && $wgUser->getOption( 'usebetatoolbar-cgd' ) )
3350 ) );
Index: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.min.js
——@@ -0,0 +1,111 @@
 2+
 3+js2AddOnloadHook(function(){if(typeof wgEditToolbarCGD!='undefined'&&wgEditToolbarCGD)
 4+$j('#wpTextbox1').addClass('withCGD');if($j.wikiEditor!=undefined&&$j.wikiEditor.isSupported()||!$j.wikiEditor.isSupportKnown()){$j('#toolbar').remove();$j('textarea#wpTextbox1').wikiEditor({'toolbar':{'main':{type:'toolbar',groups:{'format':{tools:{'bold':{labelMsg:'edittoolbar-tool-bold',type:'button',icon:'format-bold.png',action:{type:'encapsulate',options:{pre:"'''",periMsg:'edittoolbar-tool-bold-example',post:"'''"}}},'italic':{section:'main',group:'format',id:'italic',labelMsg:'edittoolbar-tool-italic',type:'button',icon:'format-italic.png',action:{type:'encapsulate',options:{pre:"''",periMsg:'edittoolbar-tool-italic-example',post:"''"}}}}},'insert':{tools:{'xlink':{labelMsg:'edittoolbar-tool-xlink',type:'button',icon:'insert-xlink.png',filters:['#wpTextbox1:not(.withCGD)'],action:{type:'encapsulate',options:{pre:"[",periMsg:'edittoolbar-tool-xlink-example',post:"]"}}},'ilink':{labelMsg:'edittoolbar-tool-ilink',type:'button',icon:'insert-ilink.png',filters:['#wpTextbox1:not(.withCGD)'],action:{type:'encapsulate',options:{pre:"[[",periMsg:'edittoolbar-tool-ilink-example',post:"]]"}}},'linkCGD':{labelMsg:'edittoolbar-tool-link',type:'button',icon:'insert-link.png',filters:['#wpTextbox1.withCGD'],action:{type:'dialog',module:'insert-link'}},'file':{labelMsg:'edittoolbar-tool-file',type:'button',icon:'insert-file.png',action:{type:'encapsulate',options:{pre:"[[",preMsg:'edittoolbar-tool-file-pre',periMsg:'edittoolbar-tool-file-example',post:"]]"}}},'reference':{labelMsg:'edittoolbar-tool-reference',filters:['body.ns-subject'],type:'button',icon:'insert-reference.png',action:{type:'encapsulate',options:{pre:"<ref>",periMsg:'edittoolbar-tool-reference-example',post:"</ref>"}}},'signature':{labelMsg:'edittoolbar-tool-signature',filters:['body:not(.ns-0)'],type:'button',icon:'insert-signature.png',action:{type:'encapsulate',options:{post:"--~~~~"}}}}}}},'advanced':{labelMsg:'edittoolbar-section-advanced',type:'toolbar',groups:{'heading':{tools:{'heading':{labelMsg:'edittoolbar-tool-heading',type:'select',list:{'heading-2':{labelMsg:'edittoolbar-tool-heading-2',action:{type:'encapsulate',options:{pre:"==",periMsg:'edittoolbar-tool-heading-example',post:"=="}}},'heading-3':{labelMsg:'edittoolbar-tool-heading-3',action:{type:'encapsulate',options:{pre:"===",periMsg:'edittoolbar-tool-heading-example',post:"==="}}},'heading-4':{labelMsg:'edittoolbar-tool-heading-4',action:{type:'encapsulate',options:{pre:"====",periMsg:'edittoolbar-tool-heading-example',post:"===="}}},'heading-5':{labelMsg:'edittoolbar-tool-heading-5',action:{type:'encapsulate',options:{pre:"=====",periMsg:'edittoolbar-tool-heading-example',post:"====="}}}}}}},'list':{labelMsg:'edittoolbar-group-list',tools:{'ulist':{labelMsg:'edittoolbar-tool-ulist',type:'button',icon:'format-ulist.png',action:{type:'encapsulate',options:{pre:"* ",periMsg:'edittoolbar-tool-ulist-example',post:"",ownline:true}}},'olist':{labelMsg:'edittoolbar-tool-olist',type:'button',icon:'format-olist.png',action:{type:'encapsulate',options:{pre:"# ",periMsg:'edittoolbar-tool-olist-example',post:"",ownline:true}}}}},'size':{labelMsg:'edittoolbar-group-size',tools:{'big':{labelMsg:'edittoolbar-tool-big',type:'button',icon:'format-big.png',action:{type:'encapsulate',options:{pre:"<big>",periMsg:'edittoolbar-tool-big-example',post:"</big>"}}},'small':{labelMsg:'edittoolbar-tool-small',type:'button',icon:'format-small.png',action:{type:'encapsulate',options:{pre:"<small>",periMsg:'edittoolbar-tool-small-example',post:"</small>"}}}}},'baseline':{labelMsg:'edittoolbar-group-baseline',tools:{'superscript':{labelMsg:'edittoolbar-tool-superscript',type:'button',icon:'format-superscript.png',action:{type:'encapsulate',options:{pre:"<sup>",periMsg:'edittoolbar-tool-superscript-example',post:"</sup>"}}},'subscript':{labelMsg:'edittoolbar-tool-subscript',type:'button',icon:'format-subscript.png',action:{type:'encapsulate',options:{pre:"<sub>",periMsg:'edittoolbar-tool-subscript-example',post:"</sub>"}}}}},'insert':{labelMsg:'edittoolbar-group-insert',tools:{'gallery':{labelMsg:'edittoolbar-tool-gallery',type:'button',icon:'insert-gallery.png',action:{type:'encapsulate',options:{pre:"<gallery>\n",periMsg:'edittoolbar-tool-gallery-example',post:"\n</gallery>",ownline:true}}},'tableCGD':{labelMsg:'edittoolbar-tool-table',type:'button',icon:'insert-table.png',filters:['#wpTextbox1.withCGD'],action:{type:'dialog',module:'insert-table'}},'table':{labelMsg:'edittoolbar-tool-table',type:'button',icon:'insert-table.png',filters:['#wpTextbox1:not(.withCGD)'],action:{type:'encapsulate',options:{pre:"{| class=\"wikitable\" border=\"1\"\n|",periMsg:'edittoolbar-tool-table-example-old',post:"\n|}",ownline:true}}},'newline':{labelMsg:'edittoolbar-tool-newline',type:'button',icon:'insert-newline.png',action:{type:'encapsulate',options:{pre:"<br />\n"}}}}},'search':{tools:{'replace':{labelMsg:'edittoolbar-tool-replace',type:'button',icon:'search-replace.png',filters:['#wpTextbox1.withCGD'],action:{type:'dialog',module:'search-and-replace'}}}}}},'characters':{labelMsg:'edittoolbar-section-characters',type:'booklet',pages:{'latin':{'labelMsg':'edittoolbar-characters-page-latin','layout':'characters','characters':["\u00c1","\u00e1","\u00c0","\u00e0","\u00c2","\u00e2","\u00c4","\u00e4","\u00c3","\u00e3","\u01cd","\u01ce","\u0100","\u0101","\u0102","\u0103","\u0104","\u0105","\u00c5","\u00e5","\u0106","\u0107","\u0108","\u0109","\u00c7","\u00e7","\u010c","\u010d","\u010a","\u010b","\u0110","\u0111","\u010e","\u010f","\u00c9","\u00e9","\u00c8","\u00e8","\u00ca","\u00ea","\u00cb","\u00eb","\u011a","\u011b","\u0112","\u0113","\u0114","\u0115","\u0116","\u0117","\u0118","\u0119","\u011c","\u011d","\u0122","\u0123","\u011e","\u011f","\u0120","\u0121","\u0124","\u0125","\u0126","\u0127","\u00cd","\u00ed","\u00cc","\u00ec","\u00ce","\u00ee","\u00cf","\u00ef","\u0128","\u0129","\u01cf","\u01d0","\u012a","\u012b","\u012c","\u012d","\u0130","\u0131","\u012e","\u012f","\u0134","\u0135","\u0136","\u0137","\u0139","\u013a","\u013b","\u013c","\u013d","\u013e","\u0141","\u0142","\u013f","\u0140","\u0143","\u0144","\u00d1","\u00f1","\u0145","\u0146","\u0147","\u0148","\u00d3","\u00f3","\u00d2","\u00f2","\u00d4","\u00f4","\u00d6","\u00f6","\u00d5","\u00f5","\u01d1","\u01d2","\u014c","\u014d","\u014e","\u014f","\u01ea","\u01eb","\u0150","\u0151","\u0154","\u0155","\u0156","\u0157","\u0158","\u0159","\u015a","\u015b","\u015c","\u015d","\u015e","\u015f","\u0160","\u0161","\u0162","\u0163","\u0164","\u0165","\u00da","\u00fa","\u00d9","\u00f9","\u00db","\u00fb","\u00dc","\u00fc","\u0168","\u0169","\u016e","\u016f","\u01d3","\u01d4","\u016a","\u016b","\u01d6","\u01d8","\u01da","\u01dc","\u016c","\u016d","\u0172","\u0173","\u0170","\u0171","\u0174","\u0175","\u00dd","\u00fd","\u0176","\u0177","\u0178","\u00ff","\u0232","\u0233","\u0179","\u017a","\u017d","\u017e","\u017b","\u017c","\u00c6","\u00e6","\u01e2","\u01e3","\u00d8","\u00f8","\u0152","\u0153","\u00df","\u00f0","\u00de","\u00fe","\u018f","\u0259"]},'latinextended':{'labelMsg':'edittoolbar-characters-page-latinextended','layout':'characters','characters':["\u1e00","\u1e01","\u1e9a","\u1ea0","\u1ea1","\u1ea2","\u1ea3","\u1ea4","\u1ea5","\u1ea6","\u1ea7","\u1ea8","\u1ea9","\u1eaa","\u1eab","\u1eac","\u1ead","\u1eae","\u1eaf","\u1eb0","\u1eb1","\u1eb2","\u1eb3","\u1eb4","\u1eb5","\u1eb6","\u1eb7","\u1e02","\u1e03","\u1e04","\u1e05","\u1e06","\u1e07","\u1e08","\u1e09","\u1e0a","\u1e0b","\u1e0c","\u1e0d","\u1e0e","\u1e0f","\u1e10","\u1e11","\u1e12","\u1e13","\u1e14","\u1e15","\u1e16","\u1e17","\u1e18","\u1e19","\u1e1a","\u1e1b","\u1e1c","\u1e1d","\u1eb8","\u1eb9","\u1eba","\u1ebb","\u1ebc","\u1ebd","\u1ebe","\u1ebf","\u1ec0","\u1ec1","\u1ec2","\u1ec3","\u1ec4","\u1ec5","\u1ec6","\u1ec7","\u1e1e","\u1e1f","\u1e20","\u1e21","\u1e22","\u1e23","\u1e24","\u1e25","\u1e26","\u1e27","\u1e28","\u1e29","\u1e2a","\u1e2b","\u1e96","\u1e2c","\u1e2d","\u1e2e","\u1e2f","\u1ec8","\u1ec9","\u1eca","\u1ecb","\u1e30","\u1e31","\u1e32","\u1e33","\u1e34","\u1e35","\u1e36","\u1e37","\u1e38","\u1e39","\u1e3a","\u1e3b","\u1e3c","\u1e3d","\u1efa","\u1efb","\u1e3e","\u1e3f","\u1e40","\u1e41","\u1e42","\u1e43","\u1e44","\u1e45","\u1e46","\u1e47","\u1e48","\u1e49","\u1e4a","\u1e4b","\u1e4c","\u1e4d","\u1e4e","\u1e4f","\u1e50","\u1e51","\u1e52","\u1e53","\u1ecc","\u1ecd","\u1ece","\u1ecf","\u1ed0","\u1ed1","\u1ed2","\u1ed3","\u1ed4","\u1ed5","\u1ed6","\u1ed7","\u1ed8","\u1ed9","\u1eda","\u1edb","\u1edc","\u1edd","\u1ede","\u1edf","\u1ee0","\u1ee1","\u1ee2","\u1ee3","\u1e54","\u1e55","\u1e56","\u1e57","\u1e58","\u1e59","\u1e5a","\u1e5b","\u1e5c","\u1e5d","\u1e5e","\u1e5f","\u1e60","\u1e61","\u1e9b","\u1e62","\u1e63","\u1e64","\u1e65","\u1e66","\u1e67","\u1e68","\u1e69","\u1e9c","\u1e9d","\u1e6a","\u1e6b","\u1e6c","\u1e6d","\u1e6e","\u1e6f","\u1e70","\u1e71","\u1e97","\u1e72","\u1e73","\u1e74","\u1e75","\u1e76","\u1e77","\u1e78","\u1e79","\u1e7a","\u1e7b","\u1ee4","\u1ee5","\u1ee6","\u1ee7","\u1ee8","\u1ee9","\u1eea","\u1eeb","\u1eec","\u1eed","\u1eee","\u1eef","\u1ef0","\u1ef1","\u1e7c","\u1e7d","\u1e7e","\u1e7f","\u1efc","\u1efd","\u1e80","\u1e81","\u1e82","\u1e83","\u1e84","\u1e85","\u1e86","\u1e87","\u1e88","\u1e89","\u1e98","\u1e8a","\u1e8b","\u1e8c","\u1e8d","\u1e8e","\u1e8f","\u1e99","\u1ef2","\u1ef3","\u1ef4","\u1ef5","\u1ef6","\u1ef7","\u1ef8","\u1ef9","\u1efe","\u1eff","\u1e90","\u1e91","\u1e92","\u1e93","\u1e94","\u1e95","\u1e9e","\u1e9f"]},'ipa':{labelMsg:'edittoolbar-characters-page-ipa',layout:'characters',characters:["p","t\u032a","t","\u0288","c","k","q","\u02a1","\u0294","b","d\u032a","d","\u0256","\u025f","\u0261","\u0262","\u0253","\u0257","\u0284","\u0260","\u029b","t\u0361s","t\u0361\u0283","t\u0361\u0255","d\u0361z","d\u0361\u0292","d\u0361\u0291","\u0278","f","\u03b8","s","\u0283","\u0285","\u0286","\u0282","\u0255","\u00e7","\u0267","x","\u03c7","\u0127","\u029c","h","\u03b2","v","\u028d","\u00f0","z","\u0292","\u0293","\u0290","\u0291","\u029d","\u0263","\u0281","\u0295","\u0296","\u02a2","\u0266","\u026c","\u026e","m","m\u0329","\u0271","\u0271\u0329","\u0271\u030d","n\u032a","n\u032a\u030d","n","n\u0329","\u0273","\u0273\u0329","\u0272","\u0272\u0329","\u014b","\u014b\u030d","\u014b\u0329","\u0274","\u0274\u0329","\u0299","\u0299\u0329","r","r\u0329","\u0280","\u0280\u0329","\u027e","\u027d","\u027f","\u027a","l\u032a","l\u032a\u0329","l","l\u0329","\u026b","\u026b\u0329","\u026d","\u026d\u0329","\u028e","\u028e\u0329","\u029f","\u029f\u0329","w","\u0265","\u028b","\u0279","\u027b","j","\u0270","\u0298","\u01c2","\u01c0","!","\u01c1","\u02b0","\u02b1","\u02b7","\u02b8","\u02b2","\u02b3","\u207f","\u02e1","\u02b4","\u02b5","\u02e2","\u02e3","\u02e0","\u02b6","\u02e4","\u02c1","\u02c0","\u02bc","i","i\u032f","\u0129","y","y\u032f","\u1ef9","\u026a","\u026a\u032f","\u026a\u0303","\u028f","\u028f\u032f","\u028f\u0303","\u0268","\u0268\u032f","\u0268\u0303","\u0289","\u0289\u032f","\u0289\u0303","\u026f","\u026f\u032f","\u026f\u0303","u","u\u032f","\u0169","\u028a","\u028a\u032f","\u028a\u0303","e","e\u032f","\u1ebd","\u00f8","\u00f8\u032f","\u00f8\u0303","\u0258","\u0258\u032f","\u0258\u0303","\u0275","\u0275\u032f","\u0275\u0303","\u0264","\u0264\u032f","\u0264\u0303","o","o\u032f","\u00f5","\u025b","\u025b\u032f","\u025b\u0303","\u0153","\u0153\u032f","\u0153\u0303","\u025c","\u025c\u032f","\u025c\u0303","\u0259","\u0259\u032f","\u0259\u0303","\u025e","\u025e\u032f","\u025e\u0303","\u028c","\u028c\u032f","\u028c\u0303","\u0254","\u0254\u032f","\u0254\u0303","\u00e6","\u00e6\u032f","\u00e6\u0303","\u0276","\u0276\u032f","\u0276\u0303","a","a\u032f","\u00e3","\u0250","\u0250\u032f","\u0250\u0303","\u0251","\u0251\u032f","\u0251\u0303","\u0252","\u0252\u032f","\u0252\u0303","\u02c8","\u02cc","\u02d0","\u02d1","\u02d8",".","\u203f","|","\u2016"]},'symbols':{'labelMsg':'edittoolbar-characters-page-symbols','layout':'characters','characters':["~","|","\u00a1","\u00bf","\u2020","\u2021","\u2194","\u2191","\u2193","\u2022","\u00b6","#","\u00bd","\u2153","\u2154","\u00bc","\u00be","\u215b","\u215c","\u215d","\u215e","\u221e","\u2018","\u201c","\u2019","\u201d",{'label':"\u00ab\u00bb",'action':{'type':'encapsulate','options':{'pre':"\u00ab",'post':"\u00bb"}}},"\u00a4","\u20b3","\u0e3f","\u20b5","\u00a2","\u20a1","\u20a2","$","\u20ab","\u20af","\u20ac","\u20a0","\u20a3","\u0192","\u20b4","\u20ad","\u20a4","\u2133","\u20a5","\u20a6","\u2116","\u20a7","\u20b0","\u00a3","\u17db","\u20a8","\u20aa","\u09f3","\u20ae","\u20a9","\u00a5","\u2660","\u2663","\u2665","\u2666","m\u00b2","m\u00b3","\u2013","\u2014","\u2026","\u2018","\u201c","\u2019","\u201d","\u00b0","\u2033","\u2032","\u2248","\u2260","\u2264","\u2265","\u00b1","\u2212","\u00d7","\u00f7","\u2190","\u2192","\u00b7","\u00a7"]},'greek':{'labelMsg':'edittoolbar-characters-page-greek','layout':'characters','language':'hl','characters':["\u0391","\u0386","\u03b1","\u03ac","\u0392","\u03b2","\u0393","\u03b3","\u0394","\u03b4","\u0395","\u0388","\u03b5","\u03ad","\u0396","\u03b6","\u0397","\u0389","\u03b7","\u03ae","\u0398","\u03b8","\u0399","\u038a","\u03b9","\u03af","\u039a","\u03ba","\u039b","\u03bb","\u039c","\u03bc","\u039d","\u03bd","\u039e","\u03be","\u039f","\u038c","\u03bf","\u03cc","\u03a0","\u03c0","\u03a1","\u03c1","\u03a3","\u03c3","\u03c2","\u03a4","\u03c4","\u03a5","\u038e","\u03c5","\u03cd","\u03a6","\u03c6","\u03a7","\u03c7","\u03a8","\u03c8","\u03a9","\u038f","\u03c9","\u03ce"]},'cyrillic':{'labelMsg':'edittoolbar-characters-page-cyrillic','layout':'characters','characters':["\u0410","\u0430","\u04d8","\u04d9","\u0411","\u0431","\u0412","\u0432","\u0413","\u0433","\u0490","\u0491","\u0403","\u0453","\u0492","\u0493","\u0414","\u0434","\u0402","\u0452","\u0415","\u0435","\u0404","\u0454","\u0401","\u0451","\u0416","\u0436","\u0417","\u0437","\u0405","\u0455","\u0418","\u0438","\u0406","\u0456","\u0407","\u0457","\u0130","\u0419","\u0439","\u04e2","\u04e3","\u0408","\u0458","\u041a","\u043a","\u040c","\u045c","\u049a","\u049b","\u041b","\u043b","\u0409","\u0459","\u041c","\u043c","\u041d","\u043d","\u040a","\u045a","\u04a2","\u04a3","\u041e","\u043e","\u04e8","\u04e9","\u041f","\u043f","\u0420","\u0440","\u0421","\u0441","\u0422","\u0442","\u040b","\u045b","\u0423","\u0443","\u040e","\u045e","\u04ee","\u04ef","\u04b0","\u04b1","\u04ae","\u04af","\u0424","\u0444","\u0425","\u0445","\u04b2","\u04b3","\u04ba","\u04bb","\u0426","\u0446","\u0427","\u0447","\u04b6","\u04b7","\u040f","\u045f","\u0428","\u0448","\u0429","\u0449","\u042a","\u044a","\u042b","\u044b","\u042c","\u044c","\u042d","\u044d","\u042e","\u044e","\u042f","\u044f"]},'arabic':{'labelMsg':'edittoolbar-characters-page-arabic','layout':'characters','language':'ar','direction':'rtl','characters':["\u061b","\u061f","\u0621","\u0622","\u0623","\u0624","\u0625","\u0626","\u0627","\u0628","\u0629","\u062a","\u062b","\u062c","\u062d","\u062e","\u062f","\u0630","\u0631","\u0632","\u0633","\u0634","\u0635","\u0636","\u0637","\u0638","\u0639","\u063a","\u0641","\u0642","\u0643","\u0644","\u0645","\u0646","\u0647","\u0648","\u0649","\u064a","\u060c","\u067e","\u0686","\u0698","\u06af","\u06ad"]},'hebrew':{'labelMsg':'edittoolbar-characters-page-hebrew','layout':'characters','direction':'rtl','characters':["\u05d0","\u05d1","\u05d2","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05db","\u05da","\u05dc","\u05de","\u05dd","\u05e0","\u05df","\u05e1","\u05e2","\u05e4","\u05e3","\u05e6","\u05e5","\u05e7","\u05e8","\u05e9","\u05ea","\u05f3","\u05f4","\u05f0","\u05f1","\u05f2","\u05d0","\u05d3","\u05d4","\u05d5","\u05d6","\u05d7","\u05d8","\u05d9","\u05da","\u05db","\u05dc","\u05dd","\u05de","\u05df","\u05e0","\u05e1","\u05e2","\u05e3","\u05e4","\u05be","\u05f3","\u05f4",["\u05b0\u25cc","\u05b0"],["\u05b1\u25cc","\u05b1"],["\u05b2\u25cc","\u05b2"],["\u05b3\u25cc","\u05b3"],["\u05b4\u25cc","\u05b4"],["\u05b5\u25cc","\u05b5"],["\u05b6\u25cc","\u05b6"],["\u05b7\u25cc","\u05b7"],["\u05b8\u25cc","\u05b8"],["\u05b9\u25cc","\u05b9"],["\u05bb\u25cc","\u05bb"],["\u05bc\u25cc","\u05bc"],["\u05c1\u25cc","\u05c1"],["\u05c2\u25cc","\u05c2"],["\u05c7\u25cc","\u05c7"],["\u0591\u25cc","\u0591"],["\u0592\u25cc","\u0592"],["\u0593\u25cc","\u0593"],["\u0594\u25cc","\u0594"],["\u0595\u25cc","\u0595"],["\u0596\u25cc","\u0596"],["\u0597\u25cc","\u0597"],["\u0598\u25cc","\u0598"],["\u0599\u25cc","\u0599"],["\u059a\u25cc","\u059a"],["\u059b\u25cc","\u059b"],["\u059c\u25cc","\u059c"],["\u059d\u25cc","\u059d"],["\u059e\u25cc","\u059e"],["\u059f\u25cc","\u059f"],["\u05a0\u25cc","\u05a0"],["\u05a1\u25cc","\u05a1"],["\u05a2\u25cc","\u05a2"],["\u05a3\u25cc","\u05a3"],["\u05a4\u25cc","\u05a4"],["\u05a5\u25cc","\u05a5"],["\u05a6\u25cc","\u05a6"],["\u05a7\u25cc","\u05a7"],["\u05a8\u25cc","\u05a8"],["\u05a9\u25cc","\u05a9"],["\u05aa\u25cc","\u05aa"],["\u05ab\u25cc","\u05ab"],["\u05ac\u25cc","\u05ac"],["\u05ad\u25cc","\u05ad"],["\u05ae\u25cc","\u05ae"],["\u05af\u25cc","\u05af"],["\u05bf\u25cc","\u05bf"],["\u05c0\u25cc","\u05c0"],["\u05c3\u25cc","\u05c3"]]},'telugu':{'labelMsg':'edittoolbar-characters-page-telugu','language':'te','layout':'characters','characters':["\u0c01","\u0c02","\u0c03","\u0c05","\u0c06","\u0c07","\u0c08","\u0c09","\u0c0a","\u0c0b","\u0c60","\u0c0c","\u0c61","\u0c0e","\u0c0f","\u0c10","\u0c12","\u0c13","\u0c14","\u0c15","\u0c16","\u0c17","\u0c18","\u0c19","\u0c1a","\u0c1b","\u0c1c","\u0c1d","\u0c1e","\u0c1f","\u0c20","\u0c21","\u0c22","\u0c23","\u0c24","\u0c25","\u0c26","\u0c27","\u0c28","\u0c2a","\u0c2b","\u0c2c","\u0c2d","\u0c2e","\u0c2f","\u0c30","\u0c31","\u0c32","\u0c33","\u0c35","\u0c36","\u0c37","\u0c38","\u0c39","\u0c3e","\u0c3f","\u0c40","\u0c41","\u0c42","\u0c43","\u0c44","\u0c46","\u0c47","\u0c48","\u0c4a","\u0c4b","\u0c4c","\u0c4d","\u0c62","\u0c63","\u0c58","\u0c59","\u0c66","\u0c67","\u0c68","\u0c69","\u0c6a","\u0c6b","\u0c6c","\u0c6d","\u0c6e","\u0c6f","\u0c3d","\u0c78","\u0c79","\u0c7a","\u0c7b","\u0c7c","\u0c7d","\u0c7e","\u0c7f"]}}},'help':{labelMsg:'edittoolbar-section-help',type:'booklet',pages:{'format':{labelMsg:'edittoolbar-help-page-format',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-italic-description'},'syntax':{htmlMsg:'edittoolbar-help-content-italic-syntax'},'result':{htmlMsg:'edittoolbar-help-content-italic-result'}},{'description':{htmlMsg:'edittoolbar-help-content-bold-description'},'syntax':{htmlMsg:'edittoolbar-help-content-bold-syntax'},'result':{htmlMsg:'edittoolbar-help-content-bold-result'}},{'description':{htmlMsg:'edittoolbar-help-content-bolditalic-description'},'syntax':{htmlMsg:'edittoolbar-help-content-bolditalic-syntax'},'result':{htmlMsg:'edittoolbar-help-content-bolditalic-result'}}]},'link':{labelMsg:'edittoolbar-help-page-link',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-ilink-description'},'syntax':{htmlMsg:'edittoolbar-help-content-ilink-syntax'},'result':{htmlMsg:'edittoolbar-help-content-ilink-result'}},{'description':{htmlMsg:'edittoolbar-help-content-xlink-description'},'syntax':{htmlMsg:'edittoolbar-help-content-xlink-syntax'},'result':{htmlMsg:'edittoolbar-help-content-xlink-result'}}]},'heading':{labelMsg:'edittoolbar-help-page-heading',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-heading1-description'},'syntax':{htmlMsg:'edittoolbar-help-content-heading1-syntax'},'result':{htmlMsg:'edittoolbar-help-content-heading1-result'}},{'description':{htmlMsg:'edittoolbar-help-content-heading2-description'},'syntax':{htmlMsg:'edittoolbar-help-content-heading2-syntax'},'result':{htmlMsg:'edittoolbar-help-content-heading2-result'}},{'description':{htmlMsg:'edittoolbar-help-content-heading3-description'},'syntax':{htmlMsg:'edittoolbar-help-content-heading3-syntax'},'result':{htmlMsg:'edittoolbar-help-content-heading3-result'}},{'description':{htmlMsg:'edittoolbar-help-content-heading4-description'},'syntax':{htmlMsg:'edittoolbar-help-content-heading4-syntax'},'result':{htmlMsg:'edittoolbar-help-content-heading4-result'}},{'description':{htmlMsg:'edittoolbar-help-content-heading5-description'},'syntax':{htmlMsg:'edittoolbar-help-content-heading5-syntax'},'result':{htmlMsg:'edittoolbar-help-content-heading5-result'}}]},'list':{labelMsg:'edittoolbar-help-page-list',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-ulist-description'},'syntax':{htmlMsg:'edittoolbar-help-content-ulist-syntax'},'result':{htmlMsg:'edittoolbar-help-content-ulist-result'}},{'description':{htmlMsg:'edittoolbar-help-content-olist-description'},'syntax':{htmlMsg:'edittoolbar-help-content-olist-syntax'},'result':{htmlMsg:'edittoolbar-help-content-olist-result'}}]},'file':{labelMsg:'edittoolbar-help-page-file',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-file-description'},'syntax':{htmlMsg:'edittoolbar-help-content-file-syntax'},'result':{htmlMsg:'edittoolbar-help-content-file-result'}}]},'reference':{labelMsg:'edittoolbar-help-page-reference',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-reference-description'},'syntax':{htmlMsg:'edittoolbar-help-content-reference-syntax'},'result':{htmlMsg:'edittoolbar-help-content-reference-result'}},{'description':{htmlMsg:'edittoolbar-help-content-rereference-description'},'syntax':{htmlMsg:'edittoolbar-help-content-rereference-syntax'},'result':{htmlMsg:'edittoolbar-help-content-rereference-result'}},{'description':{htmlMsg:'edittoolbar-help-content-showreferences-description'},'syntax':{htmlMsg:'edittoolbar-help-content-showreferences-syntax'},'result':{htmlMsg:'edittoolbar-help-content-showreferences-result'}}]},'discussion':{labelMsg:'edittoolbar-help-page-discussion',layout:'table',headings:[{textMsg:'edittoolbar-help-heading-description'},{textMsg:'edittoolbar-help-heading-syntax'},{textMsg:'edittoolbar-help-heading-result'}],rows:[{'description':{htmlMsg:'edittoolbar-help-content-signaturetimestamp-description'},'syntax':{htmlMsg:'edittoolbar-help-content-signaturetimestamp-syntax'},'result':{htmlMsg:'edittoolbar-help-content-signaturetimestamp-result'}},{'description':{htmlMsg:'edittoolbar-help-content-signature-description'},'syntax':{htmlMsg:'edittoolbar-help-content-signature-syntax'},'result':{htmlMsg:'edittoolbar-help-content-signature-result'}},{'description':{htmlMsg:'edittoolbar-help-content-indent-description'},'syntax':{htmlMsg:'edittoolbar-help-content-indent-syntax'},'result':{htmlMsg:'edittoolbar-help-content-indent-result'}}]}}}},'dialogs':{'insert-link':{titleMsg:'edittoolbar-tool-link-title',id:'edittoolbar-link-dialog',html:'\
 5+ <fieldset><table style="width: 100%;"><tr>\
 6+ <td>\
 7+ <label for="edittoolbar-link-int-target" rel="edittoolbar-tool-link-int-target"></label><br />\
 8+ <input type="text" id="edittoolbar-link-int-target" style="width: 100%;" />\
 9+ </td><td style="width: 48px;">\
 10+ <div id="edittoolbar-link-int-target-status" style="display: inline;"></div>\
 11+ </td>\
 12+ </tr><tr>\
 13+ <td>\
 14+ <label for="edittoolbar-link-int-text" rel="edittoolbar-tool-link-int-text"></label><br />\
 15+ <input type="text" id="edittoolbar-link-int-text" style="width: 100%;" />\
 16+ </td>\
 17+ </tr><tr>\
 18+ <td colspan="2">\
 19+ <div style="float: left; margin-right: 2em;">\
 20+ <input type="radio" id="edittoolbar-link-type-int" name="edittoolbar-link-type" selected />\
 21+ <label for="edittoolbar-link-type-int" rel="edittoolbar-tool-link-int"></label>\
 22+ </div><div style="float: left;">\
 23+ <input type="radio" id="edittoolbar-link-type-ext" name="edittoolbar-link-type" />\
 24+ <label for="edittoolbar-link-type-ext" rel="edittoolbar-tool-link-ext"></label>\
 25+ </div>\
 26+ </td>\
 27+ </tr>\
 28+ </table></fieldset>',init:function(){function isExternalLink(s){if(typeof arguments.callee.regex=='undefined')
 29+arguments.callee.regex=new RegExp("(^("+urlprotocols+"))|(^www\\.)|([^.]\\.[a-z]{2,}($|\\/))",'i');return s.match(arguments.callee.regex);}
 30+function updateExistence(){function updateWidget(status){$j('#edittoolbar-link-int-target-status').children().hide();$j('#edittoolbar-link-int-target-status-'+status).show();}
 31+var request=$j('#edittoolbar-link-int-target-status').data('request');if(request){request.abort();}
 32+var target=$j('#edittoolbar-link-int-target').val();var cache=$j('#edittoolbar-link-int-target-status').data('existencecache');if(cache[target]){updateWidget(cache[target]);return;}
 33+if(target==''){$j('#edittoolbar-link-int-target-status').children().hide();return;}
 34+if(isExternalLink(target)){updateWidget('external');return;}
 35+if(target.indexOf('|')!=-1){updateWidget('invalid');return;}
 36+updateWidget('loading');$j('#edittoolbar-link-int-target-status').data('request',$j.ajax({url:wgScriptPath+'/api.php',dataType:'json',data:{'action':'query','indexpageids':'','titles':target,'format':'json'},success:function(data){var page=data.query.pages[data.query.pageids[0]];var status='exists';if(typeof page.missing!='undefined')
 37+status='notexists';else if(typeof page.invalid!='undefined')
 38+status='invalid';cache[target]=status;updateWidget(status);}}));}
 39+$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#edittoolbar-link-int-target').bind('change keypress paste cut',function(){setTimeout(function(){if(isExternalLink($j('#edittoolbar-link-int-target').val()))
 40+$j('#edittoolbar-link-type-ext').attr('checked','checked');else
 41+$j('#edittoolbar-link-type-int').attr('checked','checked');if($j('#edittoolbar-link-int-text').data('untouched'))
 42+$j('#edittoolbar-link-int-text').val($j('#edittoolbar-link-int-target').val());},0);});$j('#edittoolbar-link-int-text').bind('change keypress paste cut',function(){$j(this).data('untouched',false);});var existsMsg=gM('edittoolbar-tool-link-int-target-status-exists');var notexistsMsg=gM('edittoolbar-tool-link-int-target-status-notexists');var invalidMsg=gM('edittoolbar-tool-link-int-target-status-invalid');var externalMsg=gM('edittoolbar-tool-link-int-target-status-external');var loadingMsg=gM('edittoolbar-tool-link-int-target-status-loading');$j('#edittoolbar-link-int-target-status').append($j('<img />').attr({'id':'edittoolbar-link-int-target-status-exists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-exists.png','alt':existsMsg,'title':existsMsg})).append($j('<img />').attr({'id':'edittoolbar-link-int-target-status-notexists','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-notexists.png','alt':notexistsMsg,'title':notexistsMsg})).append($j('<img />').attr({'id':'edittoolbar-link-int-target-status-invalid','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-invalid.png','alt':invalidMsg,'title':invalidMsg})).append($j('<img />').attr({'id':'edittoolbar-link-int-target-status-external','src':$j.wikiEditor.imgPath+'dialogs/'+'insert-link-external.png','alt':externalMsg,'title':externalMsg})).append($j('<img />').attr({'id':'edittoolbar-link-int-target-status-loading','src':$j.wikiEditor.imgPath+'dialogs/loading.gif','alt':loadingMsg,'title':loadingMsg})).data('existencecache',{}).children().hide();$j('#edittoolbar-link-int-target').bind('keypress paste cut',function(){if(typeof $j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
 43+var timerID=setTimeout(updateExistence,120);$j(this).data('timerID',timerID);}).change(function(){if(typeof $j(this).data('timerID')!='undefined'){clearTimeout($j(this).data('timerID'));}
 44+updateExistence();});$j('#edittoolbar-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;}
 45+var cache=$j(this).data('suggcache');if(typeof cache[title]!='undefined'){$j(this).suggestions('suggestions',cache[title]);return;}
 46+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)
 47+request.abort();}});},dialog:{width:500,buttons:{'edittoolbar-tool-link-insert':function(){function escapeInternalText(s){return s.replace(/(]{2,})/g,'<nowiki>$1</nowiki>');}
 48+function escapeExternalTarget(s){return s.replace(/ /g,'%20').replace(/]/g,'%5D');}
 49+function escapeExternalText(s){return s.replace(/(]+)/g,'<nowiki>$1</nowiki>');}
 50+var insertText='';var whitespace=$j('#edittoolbar-link-dialog').data('whitespace');var target=$j('#edittoolbar-link-int-target').val();var text=$j('#edittoolbar-link-int-text').val();if($j('#edittoolbar-link-type-int').is(':checked')){if($j('#edittoolbar-link-int-target-status-invalid').is(':visible')||target==''){alert(gM('edittoolbar-tool-link-int-invalid'));return;}
 51+if(target==text)
 52+insertText='[['+target+']]';else
 53+insertText='[['+target+'|'+escapeInternalText(text)+']]';}else{if(!target.match(/^[a-z]+:\/\/./))
 54+target='http://'+target;var match=target.match($j(this).data('articlePathRegex'));if(match&&!$j(this).data('ignoreLooksInternal')){var buttons={};var that=this;buttons[gM('edittoolbar-tool-link-lookslikeinternal-int')]=function(){$j('#edittoolbar-link-int-target').val(match[1]).change();$j(this).dialog('close');};buttons[gM('edittoolbar-tool-link-lookslikeinternal-ext')]=function(){$j(that).data('ignoreLooksInternal',true);$j(that).closest('.ui-dialog').find('button:first').click();$j(that).data('ignoreLooksInternal',false);$j(this).dialog('close');};$j.wikiEditor.modules.dialogs.quickDialog(gM('edittoolbar-tool-link-lookslikeinternal',match[1]),{buttons:buttons});return;}
 55+var escTarget=escapeExternalTarget(target);var escText=escapeExternalText(text);if(escTarget==escText)
 56+insertText=escTarget;else if(text=='')
 57+insertText='['+escTarget+']';else
 58+insertText='['+escTarget+' '+escText+']';}
 59+insertText=whitespace[0]+insertText+whitespace[1];$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:insertText}},$j(this));$j(this).dialog('close');},'edittoolbar-tool-link-cancel':function(){$j(this).dialog('close');}},open:function(){$j(this).data('articlePathRegex',new RegExp('^'+RegExp.escape(wgServer+wgArticlePath).replace(/\\\$1/g,'(.*)')+'$'));$j('#edittoolbar-link-int-target').focus();var selection=$j(this).data('context').$textarea.getSelection();$j('#edittoolbar-link-dialog').data('whitespace',['','']);if(selection!=''){var target,text,type;var matches;if((matches=selection.match(/^(\s*)\[\[([^\]\|]+)(\|([^\]\|]*))?\]\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:matches[2]);type='int';$j('#edittoolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else if((matches=selection.match(/^(\s*)\[([^\] ]+)( ([^\]]+))?\](\s*)$/))){target=matches[2];text=(matches[4]?matches[4]:'');type='ext';$j('#edittoolbar-link-dialog').data('whitespace',[matches[1],matches[5]]);}else{target=text=selection;}
 60+if(typeof text!='undefined')
 61+$j('#edittoolbar-link-int-text').val(text).change();if(typeof target!='undefined')
 62+$j('#edittoolbar-link-int-target').val(target).change();if(typeof type!='undefined')
 63+$j('#edittoolbar-link-'+type).attr('checked','checked');}
 64+$j('#edittoolbar-link-int-text').data('untouched',$j('#edittoolbar-link-int-text').val()==$j('#edittoolbar-link-int-target').val());$j('#edittoolbar-link-int-target').suggestions();if(!($j(this).data('dialogkeypressset'))){$j(this).data('dialogkeypressset',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){$j(this).find('button:first').click();e.preventDefault();}});}}}},'insert-table':{titleMsg:'edittoolbar-tool-table-title',id:'edittoolbar-table-dialog',html:'\
 65+ <fieldset><legend rel="edittoolbar-tool-table-dimensions"></legend><table><tr>\
 66+ <td><input type="checkbox" id="edittoolbar-table-dimensions-header" value="1" /></td>\
 67+ <td class="label"><label for="edittoolbar-table-dimensions-header"\
 68+ rel="edittoolbar-tool-table-dimensions-header"></label></td>\
 69+ </tr></table><table><tr>\
 70+ <td class="label"><label for="edittoolbar-table-dimensions-columns"\
 71+ rel="edittoolbar-tool-table-dimensions-columns"></label></td>\
 72+ <td><input type="text" id="edittoolbar-table-dimensions-columns" size="4" /></td>\
 73+ <td class="label"><label for="edittoolbar-table-dimensions-rows"\
 74+ rel="edittoolbar-tool-table-dimensions-rows"></label></td>\
 75+ <td><input type="text" id="edittoolbar-table-dimensions-rows" size="4" /></td>\
 76+ </tr></table></fieldset>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j('#edittoolbar-table-dimensions-rows').val(2);$j('#edittoolbar-table-dimensions-columns').val(2);},dialog:{buttons:{'edittoolbar-tool-table-insert':function(){var rowsVal=$j('#edittoolbar-table-dimensions-rows').val();var colsVal=$j('#edittoolbar-table-dimensions-columns').val();var rows=parseInt(rowsVal,10);var cols=parseInt(colsVal,10);var header=Math.min(1,$j('#edittoolbar-table-dimensions-header:checked').size());if(isNaN(rows)||isNaN(cols)||rows!=rowsVal||cols!=colsVal){alert(gM('edittoolbar-tool-table-invalidnumber'));return;}
 77+if(rows+header==0||cols==0){alert(gM('edittoolbar-tool-table-zero'));return;}
 78+if(rows*cols>1000){alert(gM('edittoolbar-tool-table-toomany',1000));return;}
 79+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;}
 80+table+=delim+' '+gM(isHeader?'edittoolbar-tool-table-example-header':'edittoolbar-tool-table-example',[r+1,c+1])+' ';}
 81+table=table.substr(0,table.length-1)+"\n";}
 82+$j.wikiEditor.modules.toolbar.fn.doAction($j(this).data('context'),{type:'replace',options:{pre:"{| class=\"wikitable\"\n",peri:table,post:"|}",ownline:true}},$j(this));$j(this).dialog('close');},'edittoolbar-tool-table-cancel':function(){$j(this).dialog('close');}},open:function(){$j('#edittoolbar-table-dimensions-columns').focus();if(!($j(this).data('dialogkeypressset'))){$j(this).data('dialogkeypressset',true);$j(this).closest('.ui-dialog').keypress(function(e){if((e.keyCode||e.which)==13){$j(this).find('button:first').click();e.preventDefault();}});}}}},'search-and-replace':{titleMsg:'edittoolbar-tool-replace-title',id:'edittoolbar-replace-dialog',html:'\
 83+ <div id="edittoolbar-replace-message">\
 84+ <div id="edittoolbar-replace-nomatch" rel="edittoolbar-tool-replace-nomatch"></div>\
 85+ <div id="edittoolbar-replace-success"></div>\
 86+ <div id="edittoolbar-replace-emptysearch" rel="edittoolbar-tool-replace-emptysearch"></div>\
 87+ <div id="edittoolbar-replace-invalidregex"></div>\
 88+ </div>\
 89+ <fieldset><table><tr>\
 90+ <td><label for="edittoolbar-replace-search" rel="edittoolbar-tool-replace-search"></label></td>\
 91+ <td><input type="text" id="edittoolbar-replace-search" /></td>\
 92+ </tr><tr>\
 93+ <td><label for="edittoolbar-replace-replace" rel="edittoolbar-tool-replace-replace"></label></td>\
 94+ <td><input type="text" id="edittoolbar-replace-replace" /></td>\
 95+ </tr></table><table><tr>\
 96+ <td><input type="checkbox" id="edittoolbar-replace-case" /></td>\
 97+ <td><label for="edittoolbar-replace-case" rel="edittoolbar-tool-replace-case"></label></td>\
 98+ </tr><tr>\
 99+ <td><input type="checkbox" id="edittoolbar-replace-regex" /></td>\
 100+ <td><label for="edittoolbar-replace-regex" rel="edittoolbar-tool-replace-regex"></label></td>\
 101+ </tr></table></fieldset>',init:function(){$j(this).find('[rel]').each(function(){$j(this).text(gM($j(this).attr('rel')));});$j(this).data('replaceCallback',function(mode){$j('#edittoolbar-replace-nomatch, #edittoolbar-replace-success, #edittoolbar-replace-emptysearch, #edittoolbar-replace-invalidregex').hide();var searchStr=$j('#edittoolbar-replace-search').val();if(searchStr==''){$j('#edittoolbar-replace-emptysearch').show();return;}
 102+var replaceStr=$j('#edittoolbar-replace-replace').val();var flags='';var matchCase=$j('#edittoolbar-replace-case').is(':checked');var isRegex=$j('#edittoolbar-replace-regex').is(':checked');if(!matchCase){flags+='i';}
 103+if(mode=='replaceAll'){flags+='g';}
 104+if(!isRegex){searchStr=RegExp.escape(searchStr);}
 105+try{var regex=new RegExp(searchStr,flags);}catch(e){$j('#edittoolbar-replace-invalidregex').text(gM('edittoolbar-tool-replace-invalidregex',e.message)).show();return;}
 106+var $textarea=$j(this).data('context').$textarea;var text=$j.wikiEditor.fixOperaBrokenness($textarea.val());var matches=false;if(mode!='replaceAll')
 107+matches=text.substr($j(this).data('offset')).match(regex);if(!matches)
 108+matches=text.match(regex);if(!matches)
 109+$j('#edittoolbar-replace-nomatch').show();else if(mode=='replaceAll'){var start=text.lastIndexOf(matches[matches.length-1]);var end=start+replaceStr.length;var replaced=text.replace(regex,replaceStr);var corr=replaced.length-text.length-replaceStr.length+matches[matches.length-1].length;$textarea.val(replaced).change().focus().setSelection(start+corr,end+corr).scrollToCaretPosition();$j('#edittoolbar-replace-success').text(gM('edittoolbar-tool-replace-success',matches.length)).show();$j(this).data('offset',0);}else{var start=text.indexOf(matches[0],$j(this).data('offset'));if(start==-1)
 110+start=text.indexOf(matches[0]);var end=start+matches[0].length;var newEnd=start+replaceStr.length;$textarea.focus().setSelection(start,end);if(mode=='replace'){$textarea.encapsulateSelection('',replaceStr,'',false,true).setSelection(start,newEnd);}
 111+$textarea.scrollToCaretPosition();$j(this).data('offset',mode=='replace'?newEnd:end);}});},dialog:{buttons:{'edittoolbar-tool-replace-button-findnext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'find');},'edittoolbar-tool-replace-button-replacenext':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replace');},'edittoolbar-tool-replace-button-replaceall':function(e){$j(this).closest('.ui-dialog').data('dialogaction',e.target);$j(this).data('replaceCallback').call(this,'replaceAll');},'edittoolbar-tool-replace-close':function(){$j(this).dialog('close');}},open:function(){$j(this).data('offset',0);$j('#edittoolbar-replace-search').focus();$j('#edittoolbar-replace-nomatch, #edittoolbar-replace-success, #edittoolbar-replace-emptysearch, #edittoolbar-replace-invalidregex').hide();if(!($j(this).data('dialogkeypressset'))){$j(this).data('dialogkeypressset',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();}});}
 112+var dialog=$j(this).closest('.ui-dialog');$j(this).data('context').$textarea.bind('keypress.srdialog',function(e){if((e.keyCode||e.which)==13){var button=dialog.data('dialogaction')||dialog.find('button:first');button.click();e.preventDefault();}});},close:function(){$j(this).data('context').$textarea.unbind('keypress.srdialog').focus();$j(this).closest('.ui-dialog').data('dialogaction',false);}}}}});}});
\ No newline at end of file
Index: trunk/extensions/UsabilityInitiative/Makefile
——@@ -37,7 +37,8 @@
3838 js/js2.combined.js\
3939 js/js2.combined.min.js\
4040 js/plugins.combined.js\
41 - js/plugins.combined.min.js
 41+ js/plugins.combined.min.js\
 42+ EditToolbar/EditToolbar.min.js
4243
4344 css/combined.css: $(CSS)
4445 cat $(CSS) > css/combined.css
——@@ -56,10 +57,15 @@
5758 if [ -e ./jsmin ]; then ./jsmin < js/plugins.combined.js > js/plugins.combined.min.js;\
5859 else jsmin < js/plugins.combined.js > js/plugins.combined.min.js; fi
5960
 61+EditToolbar/EditToolbar.min.js: EditToolbar/EditToolbar.js
 62+ if [ -e ./jsmin ]; then ./jsmin < EditToolbar/EditToolbar.js > EditToolbar/EditToolbar.min.js;\
 63+ else jsmin < EditToolbar/EditToolbar.js > EditToolbar/EditToolbar.min.js; fi
 64+
6065 css/combined.min.css : css/combined.css
6166 cat css/combined.css | sed -e 's/^[ ]*//g; s/[ ]*$$//g; s/\([:{;,]\) /\1/g; s/ {/{/g; s/\/\*.*\*\///g; /^$$/d'\
6267 > css/combined.min.css
6368
 69+
6470 jsmin:
6571 type -P jsmin &>/dev/null || ( wget http://www.crockford.com/javascript/jsmin.c; gcc jsmin.c -o jsmin )
6672

Follow-up revisions

RevisionCommit summaryAuthorDate
r58032Fix stupid typo in r57985catrope18:09, 22 October 2009

Status & tagging log