From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 9 May 2008 20:51:32 +0000 (+0000)
Subject: Split page history radio button tweaks out from wikibits.js to history.js
X-Git-Tag: 1.31.0-rc.0~47767
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=df8b5502bcacb067cbf4026294d1c0e0712d76a5;p=lhc%2Fweb%2Fwiklou.git

Split page history radio button tweaks out from wikibits.js to history.js
Only include it when it's needed -- don't force it on every reader!
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5992757577..81a71491c3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1347,7 +1347,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '142';
+$wgStyleVersion = '143';
 
 
 # Server-side caching:
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 1002d7b574..13b021c71d 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -81,6 +81,7 @@ class PageHistory {
 		$wgOut->setRobotpolicy( 'noindex,nofollow' );
 		$wgOut->setSyndicated( true );
 		$wgOut->setFeedAppendQuery( 'action=history' );
+		$wgOut->addScriptFile( 'history.js' );
 
 		$logPage = SpecialPage::getTitleFor( 'Log' );
 		$logLink = $this->mSkin->makeKnownLinkObj( $logPage, wfMsgHtml( 'viewpagelogs' ), 'page=' . $this->mTitle->getPrefixedUrl() );
diff --git a/skins/common/history.js b/skins/common/history.js
new file mode 100644
index 0000000000..57e6184918
--- /dev/null
+++ b/skins/common/history.js
@@ -0,0 +1,83 @@
+function historyRadios(parent) {
+	var inputs = parent.getElementsByTagName('input');
+	var radios = [];
+	for (var i = 0; i < inputs.length; i++) {
+		if (inputs[i].name == "diff" || inputs[i].name == "oldid") {
+			radios[radios.length] = inputs[i];
+		}
+	}
+	return radios;
+}
+
+// check selection and tweak visibility/class onclick
+function diffcheck() {
+	var dli = false; // the li where the diff radio is checked
+	var oli = false; // the li where the oldid radio is checked
+	var hf = document.getElementById('pagehistory');
+	if (!hf) {
+		return true;
+	}
+	var lis = hf.getElementsByTagName('li');
+	for (var i=0;i<lis.length;i++) {
+		var inputs = historyRadios(lis[i]);
+		if (inputs[1] && inputs[0]) {
+			if (inputs[1].checked || inputs[0].checked) { // this row has a checked radio button
+				if (inputs[1].checked && inputs[0].checked && inputs[0].value == inputs[1].value) {
+					return false;
+				}
+				if (oli) { // it's the second checked radio
+					if (inputs[1].checked) {
+						oli.className = "selected";
+						return false;
+					}
+				} else if (inputs[0].checked) {
+					return false;
+				}
+				if (inputs[0].checked) {
+					dli = lis[i];
+				}
+				if (!oli) {
+					inputs[0].style.visibility = 'hidden';
+				}
+				if (dli) {
+					inputs[1].style.visibility = 'hidden';
+				}
+				lis[i].className = "selected";
+				oli = lis[i];
+			}  else { // no radio is checked in this row
+				if (!oli) {
+					inputs[0].style.visibility = 'hidden';
+				} else {
+					inputs[0].style.visibility = 'visible';
+				}
+				if (dli) {
+					inputs[1].style.visibility = 'hidden';
+				} else {
+					inputs[1].style.visibility = 'visible';
+				}
+				lis[i].className = "";
+			}
+		}
+	}
+	return true;
+}
+
+// page history stuff
+// attach event handlers to the input elements on history page
+function histrowinit() {
+	var hf = document.getElementById('pagehistory');
+	if (!hf) {
+		return;
+	}
+	var lis = hf.getElementsByTagName('li');
+	for (var i = 0; i < lis.length; i++) {
+		var inputs = historyRadios(lis[i]);
+		if (inputs[0] && inputs[1]) {
+			inputs[0].onclick = diffcheck;
+			inputs[1].onclick = diffcheck;
+		}
+	}
+	diffcheck();
+}
+
+hookEvent("load", histrowinit);
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 354654583f..c16c9246e1 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -76,88 +76,6 @@ function toggleVisibility(_levelId, _otherId, _linkId) {
 	}
 }
 
-function historyRadios(parent) {
-	var inputs = parent.getElementsByTagName('input');
-	var radios = [];
-	for (var i = 0; i < inputs.length; i++) {
-		if (inputs[i].name == "diff" || inputs[i].name == "oldid") {
-			radios[radios.length] = inputs[i];
-		}
-	}
-	return radios;
-}
-
-// check selection and tweak visibility/class onclick
-function diffcheck() {
-	var dli = false; // the li where the diff radio is checked
-	var oli = false; // the li where the oldid radio is checked
-	var hf = document.getElementById('pagehistory');
-	if (!hf) {
-		return true;
-	}
-	var lis = hf.getElementsByTagName('li');
-	for (var i=0;i<lis.length;i++) {
-		var inputs = historyRadios(lis[i]);
-		if (inputs[1] && inputs[0]) {
-			if (inputs[1].checked || inputs[0].checked) { // this row has a checked radio button
-				if (inputs[1].checked && inputs[0].checked && inputs[0].value == inputs[1].value) {
-					return false;
-				}
-				if (oli) { // it's the second checked radio
-					if (inputs[1].checked) {
-						oli.className = "selected";
-						return false;
-					}
-				} else if (inputs[0].checked) {
-					return false;
-				}
-				if (inputs[0].checked) {
-					dli = lis[i];
-				}
-				if (!oli) {
-					inputs[0].style.visibility = 'hidden';
-				}
-				if (dli) {
-					inputs[1].style.visibility = 'hidden';
-				}
-				lis[i].className = "selected";
-				oli = lis[i];
-			}  else { // no radio is checked in this row
-				if (!oli) {
-					inputs[0].style.visibility = 'hidden';
-				} else {
-					inputs[0].style.visibility = 'visible';
-				}
-				if (dli) {
-					inputs[1].style.visibility = 'hidden';
-				} else {
-					inputs[1].style.visibility = 'visible';
-				}
-				lis[i].className = "";
-			}
-		}
-	}
-	return true;
-}
-
-// page history stuff
-// attach event handlers to the input elements on history page
-function histrowinit() {
-	var hf = document.getElementById('pagehistory');
-	if (!hf) {
-		return;
-	}
-	var lis = hf.getElementsByTagName('li');
-	for (var i = 0; i < lis.length; i++) {
-		var inputs = historyRadios(lis[i]);
-		if (inputs[0] && inputs[1]) {
-			inputs[0].onclick = diffcheck;
-			inputs[1].onclick = diffcheck;
-		}
-	}
-	diffcheck();
-}
-
 // generate toc from prefs form, fold sections
 // XXX: needs testing on IE/Mac and safari
 // more comments to follow
@@ -1209,7 +1127,6 @@ function runOnloadHook() {
 	// might cause the function to terminate prematurely
 	doneOnloadHook = true;
 
-	histrowinit();
 	unhidetzbutton();
 	tabbedprefs();
 	updateTooltipAccessKeys( null );