Changeset 1859

Timestamp:

2008-04-01 00:02:44 (2 years ago)

Author:

wwalc

Message:

Additional fix for #1882 (interlanguage links).

Location:

MediaWiki/trunk/plugins/mediawiki

Files:

• dialogs/link.html (modified) (3 diffs)
• fckplugin.js (modified) (2 diffs)

MediaWiki/trunk/plugins/mediawiki/dialogs/link.html

@@ -46 +46 @@
         FCK.Selection.SelectNode( oLink ) ;
 
+var bLinkEqualsName     = false ;
+        
 window.onload = function()
 {
@@ -67 +69 @@
         if ( sHRef == null )
                 sHRef = oLink.getAttribute( 'href' , 2 ) || '' ;
+                
+        if ( sHRef == oLink.innerHTML )
+                bLinkEqualsName = true ;
 
         GetE('txtUrl').value = sHRef ;
@@ -205 +210 @@
                 SetAttribute( oLink, '_fcksavedurl', sUri ) ;
 
-                oLink.innerHTML = sInnerHtml ;          // Set (or restore) the innerHTML
+                if ( bLinkEqualsName )
+                        oLink.innerHTML = sUri ;
+                else
+                        oLink.innerHTML = sInnerHtml ;          // Set (or restore) the innerHTML
 
         }

MediaWiki/trunk/plugins/mediawiki/fckplugin.js

@@ -277 +277 @@
                                                                 href = htmlNode.getAttribute( 'href' , 2 ) || '' ;
 
+                                                        var isWikiUrl = true ;
+                                                        
                                                         if ( hrefType == "media" )
-                                                        {
-                                                                var isWikiUrl = true ;
                                                                 stringBuilder.push( '[[Media:' ) ;
-                                                        }
                                                         else if ( htmlNode.className == "extiw" )
-                                                        {
-                                                                var isWikiUrl = true ;
                                                                 stringBuilder.push( '[[' ) ;
-                                                                href = htmlNode.getAttribute( 'title') || href;
-                                                        }
                                                         else
                                                         {
@@ -728 +723 @@
                                 eSpan.parentNode.removeChild( eSpan ) ;
                         break ;
+                }
+        }
+        
+        // Templates and magic words.
+        var aHrefs = document.getElementsByTagName( 'A' ) ;
+        var a ;
+        var i = aHrefs.length - 1 ;
+        while ( i >= 0 && ( a = aHrefs[i--] ) )
+        {
+                if (a.className == 'extiw')
+                {
+                         a.href = a.innerHTML = ":" + a.title ;
+                         a.setAttribute( '_fcksavedurl', ":" + a.title ) ;
                 }
         }