lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Perf: ckeditor was seriously slowing everything. So now we use the ckeditor basic to load it only when required.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-06 12:58:34 +00:00
parent df35b7fcf2
commit c00a376922
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT
View File

@ -13,7 +13,7 @@ Composant Version License Compatible GPL Usage
In alphabetical order of includes directory: In alphabetical order of includes directory:
AdoDb-Date 0.21 Modified BSD License Yes Date convertion AdoDb-Date 0.21 Modified BSD License Yes Date convertion
ArtiChow 1.07 Public Domain Yes Graphics ArtiChow 1.07 Public Domain Yes Graphics
CKEditor 3.5.3 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG
EFC/XFSS 1.0.1 LGPL 3.0 Yes Enhanced File Crypt/Extended File Stealth System EFC/XFSS 1.0.1 LGPL 3.0 Yes Enhanced File Crypt/Extended File Stealth System
FCKEditor 2.6.6 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG FCKEditor 2.6.6 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG
Flot 0.7 MIT Licence Yes JS library to build graph Flot 0.7 MIT Licence Yes JS library to build graph

4
htdocs/main.inc.php
View File

@ -26,7 +26,7 @@
* \file htdocs/main.inc.php * \file htdocs/main.inc.php
* \ingroup core * \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts) * \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
* \version $Id: main.inc.php,v 1.751 2011/07/06 12:09:19 eldy Exp $ * \version $Id: main.inc.php,v 1.752 2011/07/06 12:58:34 eldy Exp $
*/ */
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
@ -979,7 +979,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{ {
print '<!-- Includes JS for CKEditor -->'."\n"; print '<!-- Includes JS for CKEditor -->'."\n";
print '<script type="text/javascript">var CKEDITOR_BASEPATH = \''.DOL_URL_ROOT.'/includes/ckeditor/\';</script>'."\n"; print '<script type="text/javascript">var CKEDITOR_BASEPATH = \''.DOL_URL_ROOT.'/includes/ckeditor/\';</script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor'.$ext.'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor_basic.js"></script>'."\n";
} }
// File Upload // File Upload
if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD)) if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD))