(bug 2241) Fix colliding use of 'w' and 'd' accesskeys (this time without removing...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5489616..3f7b05b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -58,6 +58,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 4525) Move section links down visually to same level as headings 
   editsection links are now inside the heading elements)
 * (bug 7623) Validate custom HTML id's correctly in Monobook interface
+* (bug 2241) Fix collision of 'w' and 'd' accesskeys
 
 == Languages updated ==
 

diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index 76c47fd..a4f64a8 100644 (file)
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -1492,7 +1492,7 @@ Do níže uvedeného editačního pole zadejte názvy stránek, které chcete ex
 'accesskey-watch' => 'w',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js

diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index 15f580e..76b86ff 100644 (file)
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -1182,7 +1182,7 @@ Målartiklen "[[$1]]" eksisterer allerede. Vil du slette den for at lave plads t
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 312a5e3..1dd6761 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -1386,7 +1386,7 @@ Alternativ ist der Export auch mit der Syntax <tt><nowiki>[[Spezial:Export/Seite
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 'accesskey-watch' => 'w',
 

diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 539eb24..3f1e0b4 100644 (file)
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -1247,7 +1247,7 @@ Tο σύστημα ειδοποίησης του {{SITENAME}}
 'accesskey-minoredit' => 'i',
 'accesskey-save' => 's',
 'accesskey-preview' => 'p',
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 

diff --git a/languages/messages/MessagesEu.php b/languages/messages/MessagesEu.php
index cf129cf..f7591eb 100644 (file)
--- a/languages/messages/MessagesEu.php
+++ b/languages/messages/MessagesEu.php
@@ -42,7 +42,7 @@ $messages = array(
 '1movedto2' => '$1 izenburua $2-en truke aldatu da.',
 'about' => 'buruz',
 'aboutpage' => '{{ns:project}}:{{SITENAME}}ri_buruz', // TODO: grammar
-'accesskey-diff' => 'd',
+'accesskey-diff' => 'v',
 'allmessages' => 'Mezu_guztiak',
 'allpages' => 'Orri guztiak',
 'alphaindexline' => '$1 -tik $2 -raino',

diff --git a/languages/messages/MessagesGa.php b/languages/messages/MessagesGa.php
index da2b820..b1ad304 100644 (file)
--- a/languages/messages/MessagesGa.php
+++ b/languages/messages/MessagesGa.php
@@ -1305,7 +1305,7 @@ ní féidir uaslódála staire díreacha a dhéanamh faoi láthair.',
 'accesskey-minoredit' => 'm', # Mionathrú
 'accesskey-save' => 's', # Sábháil
 'accesskey-preview' => 'r', # Reamhamharc
-'accesskey-diff' => 'd', # Difríocht
+'accesskey-diff' => 'v', # Difríocht
 'accesskey-compareselectedversions' => 'l', # Leagain
 
 # tooltip help for some actions, most are in Monobook.js

diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index 68526ee..435d6f2 100644 (file)
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -1314,7 +1314,7 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 "accesskey-minoredit"  => "i",
 "accesskey-save"       => "s",
 "accesskey-preview"    => "p",
-"accesskey-diff"       => "d",
+"accesskey-diff"       => "v",
 "accesskey-compareselectedversions"    => "v",
 "accesskey-watch"      => "w",
 

diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index b7f8633..35b2e18 100644 (file)
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -1233,7 +1233,7 @@ $NEWPAGE
 'import-logentry-interwiki-detail'=> '$2 の $1 版',
 
 # Keyboard access keys for power users
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 
 # tooltip help for some actions, most are in Monobook.js
 'tooltip-search'        => 'ウィキ内を検索 [alt-f]',

diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index ef19afd..d8c24d8 100644 (file)
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -2027,7 +2027,7 @@ huh_laade darrəf.',
 'accesskey-minoredit'   => 'm',
 'accesskey-save'        => 's',
 'accesskey-preview'     => 'p',
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 'accesskey-compareselectedversions'=> 'v',
 'accesskey-watch'       => 'w',
 'tooltip-search'        => 'En de {{SITENAME}} sööke [alt-f]',

diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index 01c874c..d7de057 100644 (file)
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -1291,7 +1291,7 @@ $NEWPAGE
 'import-logentry-upload-detail'=> '$1 ревизија(и)',
 'import-logentry-interwiki'=> 'трансвикифиран $1',
 'import-logentry-interwiki-detail'=> '$1 ревизија(и) од $2',
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 'tooltip-search'        => 'Пребарајте на {{SITENAME}} [alt-f]',
 'tooltip-minoredit'     => 'Обележете ја промената како ситна [alt-i]',
 'tooltip-save'          => 'Зачувајте ги вашите промени [alt-s]',

diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 5662338..f58036d 100644 (file)
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -1171,7 +1171,7 @@ For å eksportere bruker du [[{{ns:-1}}:Export|eksportsida]] på kjeldewikien; h
 'accesskey-minoredit'   => 'i',
 'accesskey-save'        => 's',
 'accesskey-preview'     => 'p',
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 'accesskey-compareselectedversions' => 'v',
 
 # tooltip help for some actions, most are in Monobook.js

diff --git a/languages/messages/MessagesPms.php b/languages/messages/MessagesPms.php
index 5da9594..940d93c 100644 (file)
--- a/languages/messages/MessagesPms.php
+++ b/languages/messages/MessagesPms.php
@@ -1259,7 +1259,7 @@ Tute le amportassion antra wiki diferente a resto marcà ant ël [[Special:Log/i
 'accesskey-minoredit'   => 'c',
 'accesskey-save'        => 's',
 'accesskey-preview'     => 'p',
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 'accesskey-compareselectedversions'=> 'v',
 'accesskey-watch'       => 'w',
 'tooltip-search'        => 'Sërca an {{SITENAME}} [alt-f]',

diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index e72aed0..14c33fd 100644 (file)
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -1434,7 +1434,7 @@ Všetky transwiki importy sa zaznamenávajú v [[Special:Log/import|Zázname imp
 'accesskey-minoredit'   => 'i',
 'accesskey-save'        => 's',
 'accesskey-preview'     => 'p',
-'accesskey-diff'        => 'd',
+'accesskey-diff'        => 'v',
 'accesskey-compareselectedversions'=> 'v',
 'accesskey-watch'       => 'w',
 'tooltip-search'        => 'Hľadaj v tomto wiki [alt-f]',

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 65451ab..8efe7ba 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -483,8 +483,10 @@ function akeytt() {
                                } else {
                                        a = n.childNodes[0];
                                }
-
-                               if (a) {
+                               // 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)))) {
                                        a.accessKey = ta[id][0];
                                        ak = ' ['+pref+ta[id][0]+']';
                                }