diff options
Diffstat (limited to 'extensions/TinyMCE_MW2.php')
| -rw-r--r-- | extensions/TinyMCE_MW2.php | 41 |
1 files changed, 16 insertions, 25 deletions
diff --git a/extensions/TinyMCE_MW2.php b/extensions/TinyMCE_MW2.php index 3866a80..dfa0375 100644 --- a/extensions/TinyMCE_MW2.php +++ b/extensions/TinyMCE_MW2.php @@ -32,25 +32,18 @@ $wgExtensionCredits['other'][] = array( "author" => "Bret McMillan <bretm@redhat.com>", "version" => "0.1", "url" => "http://www.redhat.com/", - "description" => "Easily implement Moxiecode's TinyMCE into MediaWiki using the plugin framework, extends Joseph Socoloski's original work" - ); + "description" => "Easily implement Moxiecode's TinyMCE into MediaWiki using the plugin framework (rework of Joseph Socoloski's original work)" +); # REGISTER HOOKS $wgHooks['ArticleAfterFetchContent'][] = 'wfCheckBeforeEdit'; $wgHooks['EditPage::showEditForm:initial'][] = 'wfTinymceAddScript'; -function wfTinymceAddScript ($q) { +function wfTinymceAddScript($q) { + global $wgOut, $wgScriptPath; - global $wgOut, $wgTitle, $wgScriptPath, $wgMyWikiURL; - global $wgTempText, $wgTinymceDir, $wgTinymceTheme, $wgExt_valid_elements, $wgUseTinymce; - - $wgTinymceDir = "tinymce"; - $ns_allowed = true; - $ns = $wgTitle->getNamespace(); - - if ($ns_allowed && $wgUseTinymce) { - # use the more modern example straight from moxiecode - $wgOut->addScript("<script language=\"javascript\" type=\"text/javascript\"> + # use the more modern example straight from moxiecode + $wgOut->addScript("<script language=\"javascript\" type=\"text/javascript\"> function toggleEditor(id) { if (!tinyMCE.get(id)) tinyMCE.execCommand('mceAddControl', false, id); @@ -59,11 +52,13 @@ function toggleEditor(id) { } </script>"); - $wgOut->addScript( "<script language=\"javascript\" type=\"text/javascript\" src=\"$wgScriptPath/extensions/$wgTinymceDir/jscripts/tiny_mce/tiny_mce.js\"></script><script language=\"javascript\" type=\"text/javascript\">tinyMCE.init({ + $wgOut->addScript( "<script language=\"javascript\" type=\"text/javascript\" src=\"$wgScriptPath/extensions/tinymce/jscripts/tiny_mce/tiny_mce.js\"></script><script language=\"javascript\" type=\"text/javascript\">tinyMCE.init({ mode : \"textareas\", theme : \"advanced\", plugins : \"safari,inlinepopups,spellchecker,paste,media,fullscreen,table,mediawiki\", - entity_encoding : \"named\", + entity_encoding : \"raw\", + cleanup : true, + add_unload_trigger : false, remove_linebreaks : false, convert_newlines_to_brs : false, force_p_newlines : false, @@ -73,22 +68,18 @@ function toggleEditor(id) { convert_fonts_to_spans : true, apply_source_formatting : false, theme_advanced_buttons1 : \"bold,italic,strikethrough,underline,|,bullist,numlist,|,justifyleft,justifycenter,justifyright,|,outdent,indent,|,link,unlink,|,fullscreen\", - theme_advanced_buttons2 : \"formatselect,forecolor,|,image,media,charmap,|,undo,redo\", + theme_advanced_buttons2 : \"formatselect,forecolor,|,image,media,charmap,|,undo,redo,|,code\", theme_advanced_buttons3 : \"\", theme_advanced_buttons4 : \"\", theme_advanced_toolbar_location : \"top\", theme_advanced_toolbar_align : \"left\", theme_advanced_statusbar_location : \"bottom\", theme_advanced_resizing : true, - document_base_url : \"$wgMyWikiURL\"});</script>" ); - - #Since editing add the button - $wgOut->addHTML("<p><a href=\"javascript:toggleEditor('wpTextbox1');\" title=\"toggle wysiwyg editor\">Toggle Visual Editor</a></p>"); - } else { - $wgOut->addScript("<script language=\"javascript\" type=\"text/javascript\"></script>" ); - $wgUseTinymce = true; - } - return true; + document_base_url : \"$wgMyWikiURL\"});</script>" + ); + # Since editing add the button + $wgOut->addHTML("<p><a href=\"javascript:toggleEditor('wpTextbox1');\" title=\"toggle wysiwyg editor\">Toggle Visual Editor</a></p>"); + return true; } # Check existing article for any tags we don't want TinyMCE parsing... |