Ticket #2481: 2481.patch

fckeditor_config.js

@@ -67 +67 @@
         width: 66px; \
         height: 15px; \
 } \
+.FCK__MWHtml \
+{ \
+        background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_html.gif); \
+        width: 66px; \
+        height: 15px; \
+} \
 .FCK__MWMath \
 { \
         background-image: url(' + FCKConfig.PluginsPath + 'mediawiki/images/icon_math.gif); \

FCKeditorParser.body.php

@@ -198 +198 @@
                                                 break;
                                         case 'html':
                                                 if( $wgRawHtml ) {
-                                                        $output = $content;
-                                                        break;
+                                                        $output = $this->fck_wikiTag('html', $content, $params); //required by FCKeditor
                                                 }
-                                                // Shouldn't happen otherwise. :)
+                                                break;
                                         case 'nowiki':
                                                 $output = $this->fck_wikiTag('nowiki', $content, $params); //required by FCKeditor
                                                 break;

FCKeditorSajax.body.php

@@ -40 +40 @@
         global $wgParser;
 
         $ret = "nowiki\nincludeonly\nonlyinclude\nnoinclude\ngallery\n";
+        if( $wgRawHtml )
+        {
+                $ret.="html\n";
+        }
         foreach ($wgParser->getTags() as $h) {
                 if (!in_array($h, array("pre", "math", "ref", "references"))) {
                         $ret .= $h ."\n";
@@ -171 +175 @@
 }
 
 
+

mw12/FCKeditorParser_OldPP.body.php

@@ -199 +199 @@
                                                 break;
                                         case 'html':
                                                 if( $wgRawHtml ) {
-                                                        $output = $content;
-                                                        break;
+                                                        $output = $this->fck_wikiTag('html', $content, $params); //required by FCKeditor
                                                 }
-                                                // Shouldn't happen otherwise. :)
+                                                break;
                                         case 'nowiki':
                                                 $output = $this->fck_wikiTag('nowiki', $content, $params); //required by FCKeditor
                                                 break;

plugins/mediawiki/dialogs/special.html

@@ -55 +55 @@
                         oTemplateSpan = FCK.GetRealElement( oFakeImage ) ;
                         sFakeClass = 'FCK__MWSpecial';
                 }
+                else if ( oFakeImage.getAttribute('_fck_mw_html') )
+                {
+                        oTemplateSpan = FCK.GetRealElement( oFakeImage ) ;
+                        sFakeClass = 'FCK__MWHtml';
+                }
                 else if ( oFakeImage.getAttribute('_fck_mw_nowiki') )
                 {
                         oTemplateSpan = FCK.GetRealElement( oFakeImage ) ;
@@ -111 +116 @@
                 for ( var i = 0 ; i < results.length ; i++ )
                         FCKTools.AddSelectOption( select, results[i], results[i] ) ;
         }
-        
+        if ( sFakeClass == 'FCK__MWHtml' )
+        {
+                FCKTools.AddSelectOption( select, 'html', 'html' ) ;
+        }
         if ( sSelectedTag ) {
                 select.value = sSelectedTag ;
         }
@@ -173 +181 @@
                 case 'includeonly':
                 sFakeClass = 'FCK__MWIncludeonly';
                 break;
+                case 'html':
+                sFakeClass = 'FCK__MWHtml';
+                break;
                 case 'onlyinclude':
                 sFakeClass = 'FCK__MWOnlyinclude';
                 break;

plugins/mediawiki/fckplugin.js

@@ -555 +555 @@
                                                                         sNodeName = 'nowiki' ;
                                                                         break ;
 
+                                                                case 'fck_mw_html' :
+                                                                        sNodeName = 'html' ;
+                                                                        break ;
+
                                                                 case 'fck_mw_includeonly' :
                                                                         sNodeName = 'includeonly' ;
                                                                         break ;
@@ -873 +877 @@
                         case 'fck_mw_nowiki' :
                                 if ( className == null )
                                         className = 'FCK__MWNowiki' ;
+                        case 'fck_mw_html' :
+                                if ( className == null )
+                                        className = 'FCK__MWHtml' ;
                         case 'fck_mw_includeonly' :
                                 if ( className == null )
                                         className = 'FCK__MWIncludeonly' ;
@@ -956 +963 @@
                                 contextMenu.AddSeparator() ;
                                 contextMenu.AddItem( 'MW_Ref', 'Reference Properties' ) ;
                         }
+                        if ( tag.getAttribute( '_fck_mw_html' ) )
+                        {
+                                contextMenu.AddSeparator() ;
+                                contextMenu.AddItem( 'MW_Special', 'Special Tag Properties' ) ;
+                        }
                         if ( tag.getAttribute( '_fck_mw_math' ) )
                         {
                                 contextMenu.AddSeparator() ;