From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Wed, 21 Oct 2009 08:15:39 +0000 (+0000)
Subject: (bug 20847) Remove akeytt() function, but leave dummy. Contributed by Derk-Jan Hartman
X-Git-Tag: 1.31.0-rc.0~39203
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=301affccfd388c9c8876657497e620f0b590fbca;p=lhc%2Fweb%2Fwiklou.git

(bug 20847) Remove akeytt() function, but leave dummy. Contributed by Derk-Jan Hartman
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 71a0b66b63..23df147fe6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -564,16 +564,21 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   false on non-special pages
 * (bug 21113) "Other statistics" header on Special:Statistics is no more
   displayed when there isn't any entry in it
-* (bug 21114) Special:Contributions no longer shows diff links for new revisions
+* (bug 21114) Special:Contributions no longer shows diff links for new
+  revisions
 * (bug 21116) MediaWiki:Templatesused, MediaWiki:Templatesusedpreview and
   MediaWiki:Templatesusedsection now support plural
-* (bug 21079) There is no more line wrapping between label and field in Special:Log
-* (bug 20256) Fixed SQL errors on Special:Recentchanges and Special:Recentchangeslinked
-  on SQLite backend
+* (bug 21079) There is no more line wrapping between label and field in
+  Special:Log
+* (bug 20256) Fixed SQL errors on Special:Recentchanges and
+  Special:Recentchangeslinked on SQLite backend
 * (bug 20880) Fixed updater failure on SQLite backend
 * (bug 21182) Fixed invalid HTML in Special:Listgrouprights
-* (bug 20242) Installer no longer promts for user credentials for SQLite databases
+* (bug 20242) Installer no longer promts for user credentials for SQLite
+  databases
 * (bug 20911) Installer failed to create a SQLite database
+* (bug 20847) Deprecated deprecated akeytt() removed in wikibits.js leaving
+  dummy
 
 == API changes in 1.16 ==
 
diff --git a/skins/common/ajaxwatch.js b/skins/common/ajaxwatch.js
index f3211edd81..9dddb1f4ba 100644
--- a/skins/common/ajaxwatch.js
+++ b/skins/common/ajaxwatch.js
@@ -2,7 +2,7 @@
 // * ajax.js:
   /*extern sajax_init_object, sajax_do_call */
 // * wikibits.js:
-  /*extern changeText, akeytt, hookEvent, jsMsg */
+  /*extern changeText, hookEvent, jsMsg */
 
 // These should have been initialized in the generated js
 /*extern wgAjaxWatch, wgPageName */
@@ -44,7 +44,6 @@ wgAjaxWatch.setLinkText = function( newText ) {
 wgAjaxWatch.setLinkID = function( newId ) {
 	// We can only set the first one
 	wgAjaxWatch.watchLinks[0].parentNode.setAttribute( 'id', newId );
-	akeytt(newId); // update tooltips for Monobook
 };
 
 wgAjaxWatch.setHref = function( string ) {
diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 922d4e110e..188a438e3c 100644
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -350,63 +350,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 = new Array;
-
-	// 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 in ta) {
-		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;
@@ -967,7 +912,6 @@ function runOnloadHook() {
 	doneOnloadHook = true;
 
 	updateTooltipAccessKeys( null );
-	akeytt( null );
 	setupCheckboxShiftClick();
 	sortables_init();