Changeset 2388 for MediaWiki/trunk/FCKeditor.body.php

Timestamp:

2008-08-27 16:58:27 (4 months ago)

Author:

wwalc

Message:

Changed the way how FCKeditor is loaded + a couple of other bugfixes

Files:

• MediaWiki/trunk/FCKeditor.body.php (modified) (13 diffs)

MediaWiki/trunk/FCKeditor.body.php

@@ -1 +1 @@
 <?php
+/**
+ * Options for FCKeditor
+ * [start with FCKeditor]
+ */
+define("RTE_VISIBLE", 1);
+/**
+ * Options for FCKeditor
+ * [show toggle link]
+ */
+define('RTE_TOGGLE_LINK', 2);
+/**
+ * Options for FCKeditor
+ * [show popup link]
+ */
+define('RTE_POPUP', 4);
 
 class FCKeditor_MediaWiki {
+        public $showFCKEditor;
         private $count = array();
         private $wgFCKBypassText = "";
@@ -78 +94 @@
                 */
                 if ( (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) ||
-                                in_array($wgTitle->getNamespace(), $this->getExcludedNamespaces()) ||
+                                in_array($wgTitle->getNamespace(), $this->getExcludedNamespaces()) || !($this->showFCKEditor & RTE_VISIBLE) ||
                                 false !== strpos($pageEditor->textbox1, "__NORICHEDITOR__")
                         ) {
@@ -269 +285 @@
                 global $wgFCKWikiTextBeforeParse;
 
+                if (!isset($this->showFCKEditor))
+                {
+                        $this->showFCKEditor = 0;
+                        if ( !$wgUser->getOption( 'riched_start_disabled' ) ) {
+                                $this->showFCKEditor += RTE_VISIBLE;
+                        }
+                        if ( $wgUser->getOption( 'riched_use_popup' ) ) {
+                                $this->showFCKEditor += RTE_POPUP;
+                        }
+                        if ( $wgUser->getOption( 'riched_use_toggle' ) ) {
+                                $this->showFCKEditor += RTE_TOGGLE_LINK;
+                        }
+                }
+
+                if( (!empty($_SESSION['showMyFCKeditor'])) && ($wgUser->getOption( 'riched_toggle_remember_state' )))
+                {
+                        //clear RTE_VISIBLE flag
+                        $this->showFCKEditor &= ~RTE_VISIBLE ;
+                        //get flag from session
+                        $this->showFCKEditor |= $_SESSION['showMyFCKeditor'] ;                  
+                }
+        
                 if (!$wgUser->getOption( 'showtoolbar' ) || $wgUser->getOption( 'riched_disable' ) || !$wgFCKEditorIsCompatible) {
                         return true;
@@ -281 +319 @@
                 }
 
-                $options = new FCKeditorParserOptions();
-                $options->setTidy(true);
-                $parser = new FCKeditorParser();
-                $parser->setOutputType(OT_HTML);
                 $wgFCKWikiTextBeforeParse = $form->textbox1;
-                $form->textbox1 = $parser->parse($form->textbox1, $wgTitle, $options)->getText();
+                if ($this->showFCKEditor & RTE_VISIBLE)
+                {
+                        $options = new FCKeditorParserOptions();
+                        $options->setTidy(true);
+                        $parser = new FCKeditorParser();
+                        $parser->setOutputType(OT_HTML);
+                        $form->textbox1 = $parser->parse($form->textbox1, $wgTitle, $options)->getText();
+                }
 
                 $printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css?$wgStyleVersion" );
@@ -317 +358 @@
 HEREDOC;
 
+                $script .= '<script type="text/javascript"> ';
                 if (!empty($userStyles)) {
-                        $script .= '
-<script type="text/javascript"> 
-sEditorAreaCSS += ",'.implode(',', $userStyles).'";
-</script>';
-                }
-
+                        $script .= 'sEditorAreaCSS += ",'.implode(',', $userStyles).'";';
+                }
+                $script .= '
+var showFCKEditor = '. $this->showFCKEditor .';
+var popup = false;              //pointer to popup document
+var firstLoad = true;
+var editorMsgOn = "'. wfMsg( 'textrichditor' ) .'";
+var editorMsgOff = "'. wfMsg( 'tog-riched_disable' ) .'";
+var editorLink = "'. (($this->showFCKEditor & RTE_VISIBLE)? wfMsg( 'tog-riched_disable' ): wfMsg( 'textrichditor' )) .'";               
+var saveSetting = '. ($wgUser->getOption( 'riched_toggle_remember_state' ) ?  1 : 0) .';
+var RTE_VISIBLE = '.RTE_VISIBLE.';
+var RTE_TOGGLE_LINK = '.RTE_TOGGLE_LINK.';
+var RTE_POPUP = '.RTE_POPUP.';
+
+
+var oFCKeditor = new FCKeditor( "wpTextbox1" ) ;
+
+//Set config
+oFCKeditor.BasePath = "'.$wgScriptPath.'/'.$wgFCKEditorDir.'/" ;
+oFCKeditor.Config["CustomConfigurationsPath"] = "'.$wgScriptPath.'/'.$wgFCKEditorExtDir.'/fckeditor_config.js" ;
+oFCKeditor.Config["EditorAreaCSS"] = "'.$wgScriptPath.'/'.$wgFCKEditorExtDir.'/css/fckeditor.css" ;
+oFCKeditor.ToolbarSet = "'. $wgFCKEditorToolbarSet .'" ; 
+oFCKeditor.ready = true;
+';
+                $script .= '</script>';
+                
+                $newWinMsg = wfMsg('rich_editor_new_window');
                 $script .= <<<HEREDOC
 <script type="text/javascript"> 
 
-// Remove the mwSetupToolbar onload hook to avoid a JavaScript error with FF.
-if ( window.removeEventListener )
-        window.removeEventListener( 'load', mwSetupToolbar, false ) ;
-else if ( window.detachEvent )
-        window.detachEvent( 'onload', mwSetupToolbar ) ;
-        
-mwSetupToolbar = function() { return false ; } ;
+//IE hack to call func from popup
+function FCK_sajax(func_name, args, target) {
+        sajax_request_type = 'POST' ;
+        sajax_do_call(func_name, args, function (x) {
+                // I know this is function, not object
+                target(x);
+                }
+        );
+}
 
 function onLoadFCKeditor()
 {
-        if ( document.getElementById('wpTextbox1') )
+        if (!(showFCKEditor & RTE_VISIBLE)) 
+                showFCKEditor += RTE_VISIBLE;
+        firstLoad = false;
+        realTextarea = document.getElementById('wpTextbox1');
+        if ( realTextarea )
         {
                 var height = $wgFCKEditorHeight ;
-                
+                realTextarea.style.display = 'none';
                 if ( height == 0 )
                 {
@@ -362 +431 @@
                 
                 // Create the editor instance and replace the textarea.
-                var oFCKeditor = new FCKeditor('wpTextbox1') ;
-                oFCKeditor.BasePath = '$wgScriptPath/$wgFCKEditorDir/' ;
-                oFCKeditor.Config['CustomConfigurationsPath'] = '$wgScriptPath/$wgFCKEditorExtDir/fckeditor_config.js' ;
-                oFCKeditor.Config['EditorAreaCSS'] = "$wgScriptPath/$wgFCKEditorExtDir/css/fckeditor.css" ;
                 oFCKeditor.Height = height ;
-                oFCKeditor.ToolbarSet = '$wgFCKEditorToolbarSet' ;
                 oFCKeditor.ReplaceTextarea() ;
                 
                 // Hide the default toolbar.
-                document.getElementById('toolbar').style.cssText = 'display:none;' ;
+                document.getElementById('toolbar').style.display = 'none' ;
                 // do things with CharInsert for example
 
@@ -378 +442 @@
                         edittools_markup.style.display = 'none' ;
                 }
-                insertTags = function (tagOpen, tagClose, sampleText)
+                FCKeditorInsertTags = function (tagOpen, tagClose, sampleText, oDoc)
                 {
                         var txtarea;
 
-                        if ( !(typeof(FCK) == "undefined") && !(typeof(FCK.EditingArea) == "undefined") )
+                        if ( !(typeof(oDoc.FCK) == "undefined") && !(typeof(oDoc.FCK.EditingArea) == "undefined") )
                         {
-                                txtarea = FCK.EditingArea.Textarea ;
-                        }
-                        else if (document.editform)
+                                txtarea = oDoc.FCK.EditingArea.Textarea ;
+                        }
+                        else if (oDoc.editform)
                         {
                                 // if we have FCK enabled, behave differently...
-                                FCKarea = document.getElementById( oFCKeditor.InstanceName ) ;
-                                if ( FCKarea.style.display == 'none' )
+                                if ( showFCKEditor & RTE_VISIBLE )
                                 {
-                                        SRCiframe = document.getElementById ('wpTextbox1___Frame') ;
+                                        SRCiframe = oDoc.getElementById ('wpTextbox1___Frame') ;
                                         if ( SRCiframe )
                                         {
                                                 if (window.frames[SRCiframe])
-                                                        SRCdoc = window.frames[SRCiframe].document ;
+                                                        SRCdoc = window.frames[SRCiframe].oDoc ;
                                                 else
                                                         SRCdoc = SRCiframe.contentDocument ;
@@ -415 +478 @@
                                 else
                                 {
-                                        txtarea = document.editform.wpTextbox1 ;
+                                        txtarea = oDoc.editform.wpTextbox1 ;
                                 }
                         }
@@ -421 +484 @@
                         {
                                 // some alternate form? take the first one we can find
-                                var areas = document.getElementsByTagName( 'textarea' ) ;
+                                var areas = oDoc.getElementsByTagName( 'textarea' ) ;
                                 txtarea = areas[0] ;
                         }
@@ -427 +490 @@
                         var selText, isSample = false ;
 
-                        if ( document.selection  && document.selection.createRange ) 
+                        if ( oDoc.selection  && oDoc.selection.createRange ) 
                         { // IE/Opera
 
                                 //save window scroll position
-                                if ( document.documentElement && document.documentElement.scrollTop )
-                                        var winScroll = document.documentElement.scrollTop ;
-                                else if ( document.body )
-                                        var winScroll = document.body.scrollTop ;
+                                if ( oDoc.documentElement && oDoc.documentElement.scrollTop )
+                                        var winScroll = oDoc.documentElement.scrollTop ;
+                                else if ( oDoc.body )
+                                        var winScroll = oDoc.body.scrollTop ;
 
                                 //get current selection
                                 txtarea.focus() ;
-                                var range = document.selection.createRange() ;
+                                var range = oDoc.selection.createRange() ;
                                 selText = range.text ;
                                 //insert tags
-                                checkSelectedText() ;
+                                checkSelected();
                                 range.text = tagOpen + selText + tagClose ;
                                 //mark sample text as selected
@@ -453 +516 @@
                                 range.select();
                                 //restore window scroll position
-                                if ( document.documentElement && document.documentElement.scrollTop )
-                                        document.documentElement.scrollTop = winScroll ;
-                                else if ( document.body )
-                                        document.body.scrollTop = winScroll ;
+                                if ( oDoc.documentElement && oDoc.documentElement.scrollTop )
+                                        oDoc.documentElement.scrollTop = winScroll ;
+                                else if ( oDoc.body )
+                                        oDoc.body.scrollTop = winScroll ;
 
                         } 
@@ -500 +563 @@
         }
 }
-addOnloadHook( onLoadFCKeditor ) ;
-</script>
+function checkSelected()
+{
+        if (!selText) {
+                selText = sampleText;
+                isSample = true;
+        } else if (selText.charAt(selText.length - 1) == ' ') { //exclude ending space char
+                selText = selText.substring(0, selText.length - 1);
+                tagClose += ' '
+        } 
+}
+function initEditor()
+{       
+        var toolbar = document.getElementById('toolbar') ;
+        //show popup or toogle link
+        if (showFCKEditor & (RTE_POPUP|RTE_TOGGLE_LINK)){
+                //add new toolbar before wiki toolbar
+                var fckTools = document.createElement('div');
+                fckTools.setAttribute('id', 'fckTools');
+                toolbar.parentNode.insertBefore( fckTools, toolbar );
+                
+                var SRCtextarea = document.getElementById( "wpTextbox1" ) ;
+                if (showFCKEditor & RTE_VISIBLE) SRCtextarea.style.display = "none";
+        }
+
+        if (showFCKEditor & RTE_TOGGLE_LINK)
+        {
+                fckTools.innerHTML='[<a class="fckToogle" id="toggle_wpTextbox1" href="javascript:void(0)" onclick="ToggleFCKEditor(\'toggle\',\'wpTextbox1\')">'+ editorLink +'</a>] ';
+        }
+        if (showFCKEditor & RTE_POPUP)
+        {
+                var style = (showFCKEditor & RTE_VISIBLE) ? 'style="display:none"' : "";
+                fckTools.innerHTML+='<span ' + style + ' id="popup_wpTextbox1">[<a class="fckPopup" href="javascript:void(0)" onclick="ToggleFCKEditor(\'popup\',\'wpTextbox1\')">{$newWinMsg}</a>]</span>';
+        }
+
+        if (showFCKEditor & RTE_VISIBLE)
+        {
+                if ( toolbar )          //insert wiki buttons
+                {
+                        // Remove the mwSetupToolbar onload hook to avoid a JavaScript error with FF.
+                        if ( window.removeEventListener )
+                                window.removeEventListener( 'load', mwSetupToolbar, false ) ;
+                        else if ( window.detachEvent )
+                                window.detachEvent( 'onload', mwSetupToolbar ) ;
+                        mwSetupToolbar = function() { return false ; } ;
+
+                        for (var i = 0; i < mwEditButtons.length; i++) {
+                                mwInsertEditButton(toolbar, mwEditButtons[i]);
+                        }
+                        for (var i = 0; i < mwCustomEditButtons.length; i++) {
+                                mwInsertEditButton(toolbar, mwCustomEditButtons[i]);
+                        }
+                }
+                onLoadFCKeditor();
+        }
+        return true;
+}
+addOnloadHook( initEditor );
+
 HEREDOC;
 
-/*
-$script .= <<<HEREDOC
-<script type="text/javascript">
-function showSource() {
-        var wp = document.getElementById("wpDiff");
-        var s = document.createElement("input");
-        s.type="submit";
-        s.value="Wiki2HTML";
-        s.name="Wiki2HTML";
-        s.onclick = function wiki2html() {
-                var oEditor = FCKeditorAPI.GetInstance('wpTextbox1');
-                WikiToHTML_Call();
-                return false;
-        }
-        wp.parentNode.insertBefore(s, wp.nextSibling);
-}
-
-var sajax_debug_mode = false;
-var sajax_request_type = "GET";
-
-function WikiToHTML_Result(result) {
-        var oEditor = FCKeditorAPI.GetInstance('wpTextbox1');
-        oEditor.SetHTML(result.responseText);
-}
-function WikiToHTML_Call() {
-        var oEditor = FCKeditorAPI.GetInstance('wpTextbox1');
-        sajax_do_call('wfSajaxWikiToHTML', [oEditor.GetHTML()], WikiToHTML_Result);
-}
-
-addOnloadHook(showSource);
-</script>
+if ($this->showFCKEditor & (RTE_TOGGLE_LINK | RTE_POPUP) ){
+        //add toogle link and handler
+        $script .= <<<HEREDOC
+
+function ToggleFCKEditor(mode, objId)
+{
+        var SRCtextarea = document.getElementById( objId ) ;
+        if(mode == 'popup'){
+                if (( showFCKEditor & RTE_VISIBLE) && ( FCKeditorAPI )) //if FCKeditor is up-to-date
+                {
+                        var oEditorIns = FCKeditorAPI.GetInstance( objId );
+                        var text = oEditorIns.GetData( oEditorIns.Config.FormatSource );
+                        SRCtextarea.value = text;                       //copy text to textarea
+                }
+                FCKeditor_OpenPopup('oFCKeditor',objId);
+                return true;
+        }
+        
+        var oToggleLink = document.getElementById('toggle_'+ objId );
+        var oPopupLink = document.getElementById('popup_'+ objId );
+
+        if ( firstLoad )
+        {
+                // firstLoad = true => FCKeditor start invisible
+                if (oToggleLink) oToggleLink.innerHTML = "Loading...";
+                sajax_request_type = 'POST' ;
+                oFCKeditor.ready = false;
+                sajax_do_call('wfSajaxWikiToHTML', [SRCtextarea.value], function ( result ){
+                        if ( firstLoad )        //still
+                        {
+                                SRCtextarea.value = result.responseText; //insert parsed text
+                                onLoadFCKeditor();
+                                if (oToggleLink) oToggleLink.innerHTML = editorMsgOff;
+                                oFCKeditor.ready = true;
+                        }
+                });
+                return true;
+        }
+        
+        if (!oFCKeditor.ready) return false;            //sajax_do_call in action
+        if (!FCKeditorAPI) return false;                        //not loaded yet
+        var oEditorIns = FCKeditorAPI.GetInstance( objId );
+        var oEditorIframe  = document.getElementById( objId+'___Frame' );
+        var FCKtoolbar = document.getElementById('toolbar');
+        var bIsWysiwyg = ( oEditorIns.EditMode == FCK_EDITMODE_WYSIWYG );
+
+        //FCKeditor visible -> hidden
+        if ( showFCKEditor & RTE_VISIBLE)
+        {
+                var text = oEditorIns.GetData( oEditorIns.Config.FormatSource );
+                SRCtextarea.value = text;
+                if ( bIsWysiwyg ) oEditorIns.SwitchEditMode();          //switch to plain
+                var text = oEditorIns.GetData( oEditorIns.Config.FormatSource );
+                //copy from FCKeditor to textarea
+                SRCtextarea.value = text;
+                if (saveSetting)
+                {
+                        sajax_request_type = 'GET' ;
+                        sajax_do_call( 'wfSajaxToggleFCKeditor', ['hide'], function(){} ) ;             //remember closing in session
+                }
+                if (oToggleLink) oToggleLink.innerHTML = editorMsgOn;
+                if (oPopupLink) oPopupLink.style.display = '';
+                showFCKEditor -= RTE_VISIBLE;
+                oEditorIframe.style.display = 'none';
+                FCKtoolbar.style.display = '';
+                SRCtextarea.style.display = '';
+        }
+        //FCKeditor hidden -> visible
+        else
+        {
+                if ( bIsWysiwyg ) oEditorIns.SwitchEditMode();          //switch to plain
+                SRCtextarea.style.display = 'none';
+                //copy from textarea to FCKeditor
+                oEditorIns.EditingArea.Textarea.value = SRCtextarea.value
+                FCKtoolbar.style.display = 'none';
+                oEditorIframe.style.display = '';
+                if ( !bIsWysiwyg ) oEditorIns.SwitchEditMode();         //switch to WYSIWYG
+                showFCKEditor += RTE_VISIBLE; // showFCKEditor+=RTE_VISIBLE
+                if (oToggleLink) oToggleLink.innerHTML = editorMsgOff;
+                if (oPopupLink) oPopupLink.style.display = 'none';
+        }
+        return true;
+}
+
 HEREDOC;
-*/
+}
+
+if($this->showFCKEditor & RTE_POPUP){
+        $script .= <<<HEREDOC
+
+function FCKeditor_OpenPopup(jsID, textareaID)
+{
+        popupUrl = '${wgFCKEditorExtDir}/FCKeditor.popup.html';
+        popupUrl = popupUrl + '?var='+ jsID + '&el=' + textareaID;
+        window.open(popupUrl, null, 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=1,dependent=yes');
+        return 0;
+}
+HEREDOC;
+}
+$script .= "</script>";
 
                 $wgOut->addScript($script);
@@ -545 +731 @@
         public function onUserToggles( &$extraToggles ) {
                 $extraToggles[] = 'riched_disable';
+                $extraToggles[] = 'riched_start_disabled';
+                $extraToggles[] = 'riched_use_popup';
+                $extraToggles[] = 'riched_use_toggle';
+                $extraToggles[] = 'riched_toggle_remember_state';
+                
                 $extraToggles = array_merge($extraToggles, self::$nsToggles);
                 return true;