Changeset 803

Timestamp:

11/21/2007 11:48:24 AM (3 years ago)

Author:

OlivierBorowski

Message:

Use WikkaEdit as GUI editor (WikiEdit is not used anymore), refs #584, #578, #575
Add an additionnal "div" for textarea decorations, this fixes the "textarea-width:100%" bug, refs #576

Files:

• trunk/handlers/edit/edit.php (modified) (2 diffs)

trunk/handlers/edit/edit.php

@@ -245 +245 @@
                         // hence hsc_secure() instead of htmlspecialchars_ent() which UNescapes entities!
                         // JW/2007-02-20: why is this? wouldn't it be  easier for the person editing to show actual characters instead of entities?
-                        '<textarea id="body" name="body">'.$this->hsc_secure($body).'</textarea>'."\n"; # #427
+                        '<div id="textarea_container">'."\n".
+                        '<textarea id="body" name="body">'.$this->hsc_secure($body).'</textarea>'."\n". # #427
+                        '</div>'."\n";
                 if ($buttons_position == 'bottom')
                 {
@@ -254 +256 @@
                 if ($this->GetConfigValue('gui_editor') == 1)   // @@@ cast to boolean and compare to TRUE
                 {
-                        // Relocation: build paths using configured value(s)
-                        $protoedit_url = $this->StaticHref($this->GetConfigValue('wikiedit_uripath').'/protoedit.js');
-                        $wikiedit_path = $this->StaticHref($this->GetConfigValue('wikiedit_uripath').'/wikiedit2.js');
-                        $output .= '<script type="text/javascript" src="'.$protoedit_url.'"></script>'."\n".
-                                           '<script type="text/javascript" src="'.$wikiedit_path.'"></script>'."\n";
-                        // Relocation: we need to pass image path (ending in '/') relative to
-                        // configured WikiEdit path as a fourth parameter to wE.init :
-                        // that way WikiEdit can find its own images even if it's relocated/shared
-                        $wikiedit_imgpath = $this->StaticHref($this->GetConfigValue('wikiedit_uripath').'/images/');
-                        $output .= '<script type="text/javascript">'."  wE = new WikiEdit(); wE.init('body','WikiEdit','editornamecss','".$wikiedit_imgpath."');".'</script>'."\n";
+                        $output .= '<script type="text/javascript" src="3rdparty/plugins/wikkaedit/wikkaedit_data.js"></script>'."\n";
+                        $output .= '<script type="text/javascript" src="3rdparty/plugins/wikkaedit/wikkaedit_search.js"></script>'."\n";
+                        $output .= '<script type="text/javascript" src="3rdparty/plugins/wikkaedit/wikkaedit_actions.js"></script>'."\n";
+                        $output .= '<script type="text/javascript" src="3rdparty/plugins/wikkaedit/wikkaedit.js"></script>'."\n";                       
                 }
         }