X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=skins%2Fcommon%2Fwikibits.js;h=95b2e06974cc8ebe9f5a0f5d054ecd49bc9b3aeb;hb=4f278f513d5bf24c7252732a168e3646cc5af101;hp=cc56422becf6bfccf4cc719c3108b3bee29440c7;hpb=3dc5c4edd413ba5e95dded68271d8531603208ef;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index cc56422bec..95b2e06974 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -21,8 +21,8 @@ if (clientPC.indexOf('opera') != -1) {
 	var is_opera_preseven = window.opera && !document.childNodes;
 	var is_opera_seven = window.opera && document.childNodes;
 	var is_opera_95 = /opera\/(9\.[5-9]|[1-9][0-9])/.test( clientPC );
-	var opera6_bugs = is_opera_preseven; 	
-	var opera7_bugs = is_opera_seven && !is_opera_95; 	
+	var opera6_bugs = is_opera_preseven;
+	var opera7_bugs = is_opera_seven && !is_opera_95;
 	var opera95_bugs = /opera\/(9\.5)/.test( clientPC );
 }
 
@@ -36,7 +36,6 @@ if (!window.onloadFuncts) {
 	var onloadFuncts = [];
 }
 
-// code that is dependent on js2 functions should use js2AddOnloadHook
 function addOnloadHook(hookFunct) {
 	// Allows add-on scripts to add onload functions
 	if(!doneOnloadHook) {
@@ -163,6 +162,7 @@ function changeText(el, newText) {
 }
 
 function toggleToc() {
+	var tocmain = document.getElementById('toc');
 	var toc = document.getElementById('toc').getElementsByTagName('ul')[0];
 	var toggleLink = document.getElementById('togglelink');
 
@@ -170,10 +170,12 @@ function toggleToc() {
 		changeText(toggleLink, tocHideText);
 		toc.style.display = 'block';
 		document.cookie = "hidetoc=0";
+		tocmain.className = 'toc';
 	} else {
 		changeText(toggleLink, tocShowText);
 		toc.style.display = 'none';
 		document.cookie = "hidetoc=1";
+		tocmain.className = 'toc tochidden';
 	}
 }
 
@@ -181,14 +183,23 @@ var mwEditButtons = [];
 var mwCustomEditButtons = []; // eg to add in MediaWiki:Common.js
 
 function escapeQuotes(text) {
-	return escapeQuotesHTML(text.replace(/'/g,"\\'").replace(/\n/g,"\\n"));
+	var re = new RegExp("'","g");
+	text = text.replace(re,"\\'");
+	re = new RegExp("\\n","g");
+	text = text.replace(re,"\\n");
+	return escapeQuotesHTML(text);
 }
 
 function escapeQuotesHTML(text) {
-	return text.replace(/&/g,"&")
-		.replace(/"/g,""")
-		.replace(/</gre,"&lt;")
-		.replace(/>/g,"&gt;");
+	var re = new RegExp('&',"g");
+	text = text.replace(re,"&amp;");
+	re = new RegExp('"',"g");
+	text = text.replace(re,"&quot;");
+	re = new RegExp('<',"g");
+	text = text.replace(re,"&lt;");
+	re = new RegExp('>',"g");
+	text = text.replace(re,"&gt;");
+	return text;
 }
 
 
@@ -278,13 +289,19 @@ function updateTooltipAccessKeys( nodeList ) {
  * @return Node -- the DOM node of the new item (an LI element) or null
  */
 function addPortletLink(portlet, href, text, id, tooltip, accesskey, nextnode) {
-	var node = document.getElementById(portlet);
-	if ( !node ) return null;
-	node = node.getElementsByTagName( "ul" )[0];
+	var root = document.getElementById(portlet);
+	if ( !root ) return null;
+	var node = root.getElementsByTagName( "ul" )[0];
 	if ( !node ) return null;
 
+	// unhide portlet if it was hidden before
+	root.className = root.className.replace( /(^| )emptyPortlet( |$)/, "$2" );
+
+	var span = document.createElement( "span" );
+	span.appendChild( document.createTextNode( text ) );
+
 	var link = document.createElement( "a" );
-	link.appendChild( document.createTextNode( text ) );
+	link.appendChild( span );
 	link.href = href;
 
 	var item = document.createElement( "li" );
@@ -299,7 +316,7 @@ function addPortletLink(portlet, href, text, id, tooltip, accesskey, nextnode) {
 		link.setAttribute( "title", tooltip );
 	}
 	if ( accesskey && tooltip ) {
-		updateTooltipAccessKeys( [link] );
+		updateTooltipAccessKeys( new Array( link ) );
 	}
 
 	if ( nextnode && nextnode.parentNode == node )
@@ -332,63 +349,8 @@ function getInnerText(el) {
 	return str;
 }
 
-
-/**
- * Set up accesskeys/tooltips from the deprecated ta array.  If doId
- * is specified, only set up for that id.  Note that this function is
- * deprecated and will not be supported indefinitely -- use
- * updateTooltipAccessKey() instead.
- *
- * @param mixed doId string or null
- */
+/* Dummy for deprecated function */
 function akeytt( doId ) {
-	// A lot of user scripts (and some of the code below) break if
-	// ta isn't defined, so we make sure it is.  Explictly using
-	// window.ta avoids a "ta is not defined" error.
-	if (!window.ta) window.ta = [];
-
-	// Make a local, possibly restricted, copy to avoid clobbering
-	// the original.
-	var ta;
-	if ( doId ) {
-		ta = [doId];
-	} else {
-		ta = window.ta;
-	}
-
-	// Now deal with evil deprecated ta
-	var watchCheckboxExists = document.getElementById( 'wpWatchthis' ) ? true : false;
-	for (var id = 0; id < ta.length; id++) {
-		var n = document.getElementById(id);
-		if (n) {
-			var a = null;
-			var ak = '';
-			// Are we putting accesskey in it
-			if (ta[id][0].length > 0) {
-				// Is this object a object? If not assume it's the next child.
-
-				if (n.nodeName.toLowerCase() == "a") {
-					a = n;
-				} else {
-					a = n.childNodes[0];
-				}
-			 	// Don't add an accesskey for the watch tab if the watch
-			 	// checkbox is also available.
-				if (a && ((id != 'ca-watch' && id != 'ca-unwatch') || !watchCheckboxExists)) {
-					a.accessKey = ta[id][0];
-					ak = ' ['+tooltipAccessKeyPrefix+ta[id][0]+']';
-				}
-			} else {
-				// We don't care what type the object is when assigning tooltip
-				a = n;
-				ak = '';
-			}
-
-			if (a) {
-				a.title = ta[id][1]+ak;
-			}
-		}
-	}
 }
 
 var checkboxes;
@@ -451,36 +413,6 @@ function checkboxClickHandler(e) {
 	return true;
 }
 
-function toggle_element_activation(ida,idb) {
-	if (!document.getElementById) {
-		return;
-	}
-	//hide and show appropriate upload sizes
-	if(idb == 'wpUploadFileURL'){
-		var e = document.getElementById('mw-upload-maxfilesize');
-		if(e) e.style.display = "none";		
-		
-		var e = document.getElementById('mw-upload-maxfilesize-url');
-		if(e) e.style.display = "block";		
-	}
-	if(idb == 'wpUploadFile'){
-		var e = document.getElementById('mw-upload-maxfilesize-url');
-		if(e) e.style.display =  "none";
-					
-		var e = document.getElementById('mw-upload-maxfilesize');
-		if(e) e.style.display =  "block";
-	}
-	document.getElementById(ida).disabled = true;
-	document.getElementById(idb).disabled = false;
-}
-
-function toggle_element_check(ida,idb) {
-	if (!document.getElementById) {
-		return;
-	}
-	document.getElementById(ida).checked=true;
-	document.getElementById(idb).checked=false;
-}
 
 /*
 	Written by Jonathan Snook, http://www.snook.ca/jonathan
@@ -489,7 +421,7 @@ function toggle_element_check(ida,idb) {
 	From http://www.robertnyman.com/2005/11/07/the-ultimate-getelementsbyclassname/
 */
 function getElementsByClassName(oElm, strTagName, oClassNames){
-	var arrReturnElements = [];
+	var arrReturnElements = new Array();
 	if ( typeof( oElm.getElementsByClassName ) == "function" ) {
 		/* Use a native implementation where possible FF3, Saf3.2, Opera 9.5 */
 		var arrNativeReturn = oElm.getElementsByClassName( oClassNames );
@@ -502,7 +434,7 @@ function getElementsByClassName(oElm, strTagName, oClassNames){
 		return arrReturnElements;
 	}
 	var arrElements = (strTagName == "*" && oElm.all)? oElm.all : oElm.getElementsByTagName(strTagName);
-	var arrRegExpClassNames = [];
+	var arrRegExpClassNames = new Array();
 	if(typeof oClassNames == "object"){
 		for(var i=0; i<oClassNames.length; i++){
 			arrRegExpClassNames[arrRegExpClassNames.length] =
@@ -601,8 +533,7 @@ function ts_makeSortable(table) {
 	for (var i = 0; i < firstRow.cells.length; i++) {
 		var cell = firstRow.cells[i];
 		if ((" "+cell.className+" ").indexOf(" unsortable ") == -1) {
-			cell.innerHTML += '&nbsp;&nbsp;'
-				+ '<a href="#" class="sortheader" '
+			cell.innerHTML += '<a href="#" class="sortheader" '
 				+ 'onclick="ts_resortTable(this);return false;">'
 				+ '<span class="sortarrow">'
 				+ '<img src="'
@@ -662,8 +593,8 @@ function ts_resortTable(lnk) {
 		preprocessor = ts_dateToSortKey;
 	} else if (/^\d\d[\/.-]\d\d[\/.-]\d\d$/.test(itm)) {
 		preprocessor = ts_dateToSortKey;
-	// pound dollar euro yen currency cents
-	} else if (/(^[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test(itm)) {
+		// (minus sign)([pound dollar euro yen currency]|cents)
+	} else if (/(^([-\u2212] *)?[\u00a3$\u20ac\u00a4\u00a5]|\u00a2$)/.test(itm)) {
 		preprocessor = ts_currencyToSortKey;
 	} else if (ts_number_regex.test(itm)) {
 		preprocessor = ts_parseFloat;
@@ -671,17 +602,20 @@ function ts_resortTable(lnk) {
 
 	var reverse = (span.getAttribute("sortdir") == 'down');
 
-	var newRows = [];
-	var staticRows = [];
+	var newRows = new Array();
+	var staticRows = new Array();
 	for (var j = rowStart; j < table.rows.length; j++) {
 		var row = table.rows[j];
 		if((" "+row.className+" ").indexOf(" unsortable ") < 0) {
 			var keyText = ts_getInnerText(row.cells[column]);
+			if(keyText == undefined) {
+				keyText = ""; 
+			}
 			var oldIndex = (reverse ? -j : j);
 			var preprocessed = preprocessor( keyText.replace(/^[\s\xa0]+/, "").replace(/[\s\xa0]+$/, "") );
 
-			newRows[newRows.length] = new [row, preprocessed, oldIndex];
-		} else staticRows[staticRows.length] = [row, false, j-rowStart];
+			newRows[newRows.length] = new Array(row, preprocessed, oldIndex);
+		} else staticRows[staticRows.length] = new Array(row, false, j-rowStart);
 	}
 
 	newRows.sort(sortfn);
@@ -771,9 +705,9 @@ function ts_initTransformTable() {
 	// if percents and regular numbers aren't being mixed.
 	ts_number_regex = new RegExp(
 		"^(" +
-			"[+-]?[0-9][0-9,]*(\\.[0-9,]*)?(E[+-]?[0-9][0-9,]*)?" + // Fortran-style scientific
+			"[+-\u2212]?[0-9][0-9,]*(\\.[0-9,]*)?(E[+-\u2212]?[0-9][0-9,]*)?" + // Fortran-style scientific
 			"|" +
-			"[+-]?" + digitClass + "+%?" + // Generic localised
+			"[+-\u2212]?" + digitClass + "+%?" + // Generic localised
 		")$", "i"
 	);
 }
@@ -782,7 +716,7 @@ function ts_toLowerCase( s ) {
 	return s.toLowerCase();
 }
 
-function ts_dateToSortKey(date) {	
+function ts_dateToSortKey(date) {
 	// y2k notes: two digit years less than 50 are treated as 20XX, greater than 50 are treated as 19XX
 	if (date.length == 11) {
 		switch (date.substr(3,3).toLowerCase()) {
@@ -829,7 +763,7 @@ function ts_parseFloat( s ) {
 	}
 	if (ts_number_transform_table != false) {
 		var newNum = '', c;
-		
+
 		for ( var p = 0; p < s.length; p++ ) {
 			c = s.charAt( p );
 			if (c in ts_number_transform_table) {
@@ -840,13 +774,12 @@ function ts_parseFloat( s ) {
 		}
 		s = newNum;
 	}
-
-	num = parseFloat(s.replace(/,/g, ""));
-	return (isNaN(num) ? 0 : num);
+	num = parseFloat(s.replace(/[, ]/g, "").replace("\u2212", "-"));
+	return (isNaN(num) ? -Infinity : num);
 }
 
 function ts_currencyToSortKey( s ) {
-	return ts_parseFloat(s.replace(/[^0-9.,]/g,''));
+	return ts_parseFloat(s.replace(/[^-\u22120-9.,]/g,''));
 }
 
 function ts_sort_generic(a, b) {
@@ -923,7 +856,7 @@ function jsMsg( message, className ) {
 	if( className ) {
 		messageDiv.setAttribute( 'class', 'mw-js-message-'+className );
 	}
-	
+
 	if (typeof message === 'object') {
 		while (messageDiv.hasChildNodes()) // Remove old content
 			messageDiv.removeChild(messageDiv.firstChild);
@@ -976,7 +909,6 @@ function runOnloadHook() {
 	doneOnloadHook = true;
 
 	updateTooltipAccessKeys( null );
-	akeytt( null );
 	setupCheckboxShiftClick();
 	sortables_init();