wfMsgHtml, id's to links, new akeytt() for testing

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index e78fb87..6a0143d 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -169,11 +169,13 @@ CONTROL;
                        $patrol = '';
                }
 
-               $prevlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'previousdiff' ), 'diff=prev&oldid='.$this->mOldid );
+               $prevlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'previousdiff' ),
+                       'diff=prev&oldid='.$this->mOldid, '', '', 'id="differences-prevlink"' );
                if ( $this->newRev->isCurrent() ) {
                        $nextlink = '';
                } else {
-                       $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid );
+                       $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'nextdiff' ),
+                               'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
                }
 
                $oldHeader = "<strong>{$this->mOldtitle}</strong><br />$oldUserLink " .
@@ -240,7 +242,7 @@ CONTROL;
                $userLink = $sk->makeLinkObj( Title::makeTitleSafe( NS_USER, $this->mOldUser ), $this->mOldUser );
                $contribs = $sk->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ), wfMsg( 'contribslink' ),
                        'target=' . urlencode($this->mOldUser) );
-               $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsg( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid );
+    $nextlink = $sk->makeKnownLinkObj( $wgTitle, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid, '', '', 'id="differences-nextlink"' );
                $header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />$userLink " .
                        "($uTLink | $contribs)<br />" . $this->mOldComment .
                        '<br />' . $nextlink. "</div>\n";

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 249f720..60d2e4b 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -393,28 +393,35 @@ function insertTags(tagOpen, tagClose, sampleText) {
 function akeytt() {
     if(typeof ta == "undefined" || !ta) return;
     pref = 'alt-';
-    if(is_safari || navigator.userAgent.toLowerCase().indexOf( 'mac' ) + 1 ) pref = 'control-';
+       if(is_safari || navigator.userAgent.toLowerCase().indexOf( 'mac' ) + 1
+           || navigator.userAgent.toLowerCase().indexOf( 'konqueror' ) + 1 ) pref = 'control-';
     if(is_opera) pref = 'shift-esc-';
+
     for(id in ta) {
         n = document.getElementById(id);
         if(n){
+                       // 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];
+                               }
+
             if(a){
-                if(ta[id][0].length > 0) {
                     a.accessKey = ta[id][0];
                     ak = ' ['+pref+ta[id][0]+']';
-                } else {
-                    ak = '';
                 }
-                a.title = ta[id][1]+ak;
-            } else {
-                if(ta[id][0].length > 0) {
-                    n.accessKey = ta[id][0];
-                    ak = ' ['+pref+ta[id][0]+']';
                 } else {
+                               // We don't care what type the object is when assigning tooltip
+                               a = n;
                     ak = '';
                 }
-                n.title = ta[id][1]+ak;
+
+                       if (a) {
+                               a.title = ta[id][1]+ak;
             }
         }
     }