1 files changed, 65 insertions, 34 deletions

diff --git a/skins/common/ajaxwatch.js b/skins/common/ajaxwatch.js
index 16e4fdc4..b30e4ffd 100644
--- a/skins/common/ajaxwatch.js
+++ b/skins/common/ajaxwatch.js
@@ -2,10 +2,10 @@
 // * ajax.js:
   /*extern sajax_init_object, sajax_do_call */
 // * wikibits.js:
-  /*extern changeText, akeytt, hookEvent */
+  /*extern changeText, akeytt, hookEvent, jsMsg */
 
 // These should have been initialized in the generated js
-/*extern wgAjaxWatch, wgArticleId */
+/*extern wgAjaxWatch, wgPageName */
 
 if(typeof wgAjaxWatch === "undefined" || !wgAjaxWatch) {
 	var wgAjaxWatch = {
@@ -20,32 +20,60 @@ wgAjaxWatch.supported = true; // supported on current page and by browser
 wgAjaxWatch.watching = false; // currently watching page
 wgAjaxWatch.inprogress = false; // ajax request in progress
 wgAjaxWatch.timeoutID = null; // see wgAjaxWatch.ajaxCall
-wgAjaxWatch.watchLink1 = null; // "watch"/"unwatch" link
-wgAjaxWatch.watchLink2 = null; // second one, for (some?) non-Monobook-based
-wgAjaxWatch.oldHref = null; // url for action=watch/action=unwatch
+wgAjaxWatch.watchLinks = []; // "watch"/"unwatch" links
 
 wgAjaxWatch.setLinkText = function(newText) {
-	changeText(wgAjaxWatch.watchLink1, newText);
-	if (wgAjaxWatch.watchLink2) {
-		changeText(wgAjaxWatch.watchLink2, newText);
+	for (i = 0; i < wgAjaxWatch.watchLinks.length; i++) {
+		changeText(wgAjaxWatch.watchLinks[i], newText);
 	}
 };
 
 wgAjaxWatch.setLinkID = function(newId) {
-	wgAjaxWatch.watchLink1.id = newId;
+	// We can only set the first one
+	wgAjaxWatch.watchLinks[0].setAttribute( 'id', newId );
 	akeytt(newId); // update tooltips for Monobook
 };
 
+wgAjaxWatch.setHref = function( string ) {
+	for( i = 0; i < wgAjaxWatch.watchLinks.length; i++ ) {
+		if( string == 'watch' ) {
+			wgAjaxWatch.watchLinks[i].href = wgAjaxWatch.watchLinks[i].href
+				.replace( /&action=unwatch/, '&action=watch' );
+		} else if( string == 'unwatch' ) {
+			wgAjaxWatch.watchLinks[i].href = wgAjaxWatch.watchLinks[i].href
+				.replace( /&action=watch/, '&action=unwatch' );
+		}
+	}
+}
+
 wgAjaxWatch.ajaxCall = function() {
-	if(!wgAjaxWatch.supported || wgAjaxWatch.inprogress) {
-		return;
+	if(!wgAjaxWatch.supported) {
+		return true;
+	} else if (wgAjaxWatch.inprogress) {
+		return false;
 	}
+	if(!wfSupportsAjax()) {
+		// Lazy initialization so we don't toss up
+		// ActiveX warnings on initial page load
+		// for IE 6 users with security settings.
+		wgAjaxWatch.supported = false;
+		return true;
+	}
+
 	wgAjaxWatch.inprogress = true;
-	wgAjaxWatch.setLinkText(wgAjaxWatch.watching ? wgAjaxWatch.unwatchingMsg : wgAjaxWatch.watchingMsg);
-	sajax_do_call("wfAjaxWatch", [wgArticleId, (wgAjaxWatch.watching ? "u" : "w")], wgAjaxWatch.processResult);
+	wgAjaxWatch.setLinkText( wgAjaxWatch.watching
+		? wgAjaxWatch.unwatchingMsg : wgAjaxWatch.watchingMsg);
+	sajax_do_call(
+		"wfAjaxWatch",
+		[wgPageName, (wgAjaxWatch.watching ? "u" : "w")], 
+		wgAjaxWatch.processResult
+	);
 	// if the request isn't done in 10 seconds, allow user to try again
-	wgAjaxWatch.timeoutID = window.setTimeout(function() { wgAjaxWatch.inprogress = false; }, 10000);
-	return;
+	wgAjaxWatch.timeoutID = window.setTimeout(
+		function() { wgAjaxWatch.inprogress = false; },
+		10000
+	);
+	return false;
 };
 
 wgAjaxWatch.processResult = function(request) {
@@ -53,20 +81,22 @@ wgAjaxWatch.processResult = function(request) {
 		return;
 	}
 	var response = request.responseText;
-	if(response == "<err#>") {
-		window.location.href = wgAjaxWatch.oldHref;
-		return;
-	} else if(response == "<w#>") {
+	if( response.match(/^<w#>/) ) {
 		wgAjaxWatch.watching = true;
 		wgAjaxWatch.setLinkText(wgAjaxWatch.unwatchMsg);
 		wgAjaxWatch.setLinkID("ca-unwatch");
-		wgAjaxWatch.oldHref = wgAjaxWatch.oldHref.replace(/action=watch/, "action=unwatch");
-	} else if(response == "<u#>") {
+		wgAjaxWatch.setHref( 'unwatch' );
+	} else if( response.match(/^<u#>/) ) {
 		wgAjaxWatch.watching = false;
 		wgAjaxWatch.setLinkText(wgAjaxWatch.watchMsg);
 		wgAjaxWatch.setLinkID("ca-watch");
-		wgAjaxWatch.oldHref = wgAjaxWatch.oldHref.replace(/action=unwatch/, "action=watch");
+		wgAjaxWatch.setHref( 'watch' );
+	} else {
+		// Either we got a <err#> error code or it just plain broke.
+		window.location.href = wgAjaxWatch.watchLinks[0].href;
+		return;
 	}
+	jsMsg( response.substr(4), 'watch' );
 	wgAjaxWatch.inprogress = false;
 	if(wgAjaxWatch.timeoutID) {
 		window.clearTimeout(wgAjaxWatch.timeoutID);
@@ -75,6 +105,8 @@ wgAjaxWatch.processResult = function(request) {
 };
 
 wgAjaxWatch.onLoad = function() {
+	// This document structure hardcoding sucks.  We should make a class and
+	// toss all this out the window.
 	var el1 = document.getElementById("ca-unwatch");
 	var el2 = null;
 	if (!el1) {
@@ -96,20 +128,19 @@ wgAjaxWatch.onLoad = function() {
 		}
 	}
 
-	if(!wfSupportsAjax()) {
-		wgAjaxWatch.supported = false;
-		return;
-	}
-
 	// The id can be either for the parent (Monobook-based) or the element
 	// itself (non-Monobook)
-	wgAjaxWatch.watchLink1 = el1.tagName.toLowerCase() == "a" ? el1 : el1.firstChild;
-	wgAjaxWatch.watchLink2 = el2 ? el2 : null;
+	wgAjaxWatch.watchLinks.push( el1.tagName.toLowerCase() == "a"
+		? el1 : el1.firstChild );
 
-	wgAjaxWatch.oldHref = wgAjaxWatch.watchLink1.getAttribute("href");
-	wgAjaxWatch.watchLink1.setAttribute("href", "javascript:wgAjaxWatch.ajaxCall()");
-	if (wgAjaxWatch.watchLink2) {
-		wgAjaxWatch.watchLink2.setAttribute("href", "javascript:wgAjaxWatch.ajaxCall()");
+	if( el2 ) {
+		wgAjaxWatch.watchLinks.push( el2 );
+	}
+
+	// I couldn't get for (watchLink in wgAjaxWatch.watchLinks) to work, if
+	// you can be my guest.
+	for( i = 0; i < wgAjaxWatch.watchLinks.length; i++ ) {
+		wgAjaxWatch.watchLinks[i].onclick = wgAjaxWatch.ajaxCall;
 	}
 	return;
 };
@@ -124,4 +155,4 @@ function wfSupportsAjax() {
 	var supportsAjax = request ? true : false;
 	delete request;
 	return supportsAjax;
-}
\ No newline at end of file
+}