extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-02 03:19:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch to CKEditor4

Browse Source
This commit is contained in:
Klaus Leithoff 2013-03-14 16:30:55 +00:00
parent 48687977f9
commit a3ef1985ec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.egw_ckeditor_config.inc.php
View File

@ -18,7 +18,7 @@ class egw_ckeditor_config
private static $enterMode = null; private static $enterMode = null;
private static $skin = null; private static $skin = null;
// Defaults, defined in phpgwapi/js/ckeditor3/_source/plugins/font/plugin.js // Defaults, defined in phpgwapi/js/ckeditor/plugins/font/plugin.js
public static $font_options = array( public static $font_options = array(
'arial, helvetica, sans-serif' => 'Arial', 'arial, helvetica, sans-serif' => 'Arial',
'Comic Sans MS, cursive' => 'Comic Sans MS', 'Comic Sans MS, cursive' => 'Comic Sans MS',
@ -120,7 +120,7 @@ class egw_ckeditor_config
private static function get_base_path() private static function get_base_path()
{ {
//Get the ckeditor base url //Get the ckeditor base url
return $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor3/'; return $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/';
} }
/** /**

4
phpgwapi/inc/class.html.inc.php
View File

@ -531,7 +531,7 @@ class html
} }
//include the ckeditor js file //include the ckeditor js file
egw_framework::validate_file('ckeditor3','ckeditor','phpgwapi'); egw_framework::validate_file('ckeditor','ckeditor','phpgwapi');
// run content through htmlpurifier // run content through htmlpurifier
if ($_purify && !empty($_content)) if ($_purify && !empty($_content))
@ -556,7 +556,7 @@ class html
return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true). // true = double encoding return self::textarea($_name,$_content,'id="'.htmlspecialchars($_name).'"',true). // true = double encoding
' '
<script type="text/javascript"> <script type="text/javascript">
window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor3/"; window.CKEDITOR_BASEPATH="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/ckeditor/";
CKEDITOR.replace("'.$_name.'", '.egw_ckeditor_config::get_ckeditor_config($_mode, CKEDITOR.replace("'.$_name.'", '.egw_ckeditor_config::get_ckeditor_config($_mode,
$pxheight, $expanded, $_start_path).'); $pxheight, $expanded, $_start_path).');
CKEDITOR.instances["'.$_name.'"].on( CKEDITOR.instances["'.$_name.'"].on(