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

Keep most possible javascript into head

Browse Source
This commit is contained in:
Laurent Destailleur 2011-02-01 18:49:31 +00:00
parent 9d364554d9
commit 2a96389b9a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/lib/doleditor.class.php
View File

@ -70,7 +70,8 @@ class DolEditor
dol_syslog("DolEditor::DolEditor htmlname=".$htmlname." tool=".$tool); dol_syslog("DolEditor::DolEditor htmlname=".$htmlname." tool=".$tool);
// Name of extended editor to use // Name of extended editor to use
$this->tool=empty($conf->global->MAIN_EXTENDED_EDITOR_NAME)?'fckeditor':$conf->global->MAIN_EXTENDED_EDITOR_NAME; //$this->tool=empty($conf->global->MAIN_EXTENDED_EDITOR_NAME)?'fckeditor':$conf->global->MAIN_EXTENDED_EDITOR_NAME; // Name of constants must be NAMEOFMODULE_XXX
$this->tool=empty($conf->global->FCKEDITOR_EDITORNAME)?'fckeditor':$conf->global->FCKEDITOR_EDITORNAME;
// Check if extended editor is ok. If not we force textarea // Check if extended editor is ok. If not we force textarea
if (empty($conf->fckeditor->enabled) || ! $okforextendededitor) if (empty($conf->fckeditor->enabled) || ! $okforextendededitor)
@ -148,18 +149,18 @@ class DolEditor
if ($this->tool == 'ckeditor') if ($this->tool == 'ckeditor')
{ {
if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1'); if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
print '<script type="text/javascript"> print '<script type="text/javascript">
jQuery(document).ready(function () { jQuery(document).ready(function () {
CKEDITOR.replace(\''.$this->htmlname.'\', CKEDITOR.replace(\''.$this->htmlname.'\',
{ {
customConfig : \''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/ckeditor/config.js\', customConfig : \''.DOL_URL_ROOT.'/theme/'.$conf->theme.'/ckeditor/config.js\',
toolbar: \''.$this->toolbarname.'\', toolbar: \''.$this->toolbarname.'\',
toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').', toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
//width: '.$this->width.', //width: '.$this->width.',
height: '.$this->height.' height: '.$this->height.'
}); });
}); });
</script>'; </script>';
} }