(bug 8622) Clean up check for whether watch checkbox exists. Thanks to Brion for...

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index f466940..0ed1922 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -596,6 +596,7 @@ function akeytt( doId ) {
        }
 
        // Now deal with evil deprecated ta
+       watchCheckboxExists = getElementById( 'wpWatchthis' ) ? true : false;
        for (var id in ta) {
                var n = document.getElementById(id);
                if (n) {
@@ -612,8 +613,7 @@ function akeytt( doId ) {
                                }
                                // Don't add an accesskey for the watch tab if the watch
                                // checkbox is also available.
-                               if (a && ((id != 'ca-watch' && id != 'ca-unwatch') ||
-                               !(window.location.search.match(/[\?&](action=edit|action=submit)/i)))) {
+                               if (a && ((id != 'ca-watch' && id != 'ca-unwatch') || !watchCheckboxExists)) {
                                        a.accessKey = ta[id][0];
                                        ak = ' ['+tooltipAccessKeyPrefix+ta[id][0]+']';
                                }