diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php index 6c507d559107864dd3ce6f870cdba295a97a5ff2..176c70e4a5ae1b1e3bdac8c8f91e6b652fbf58a3 100644 --- a/htdocs/core/tpl/objectline_create.tpl.php +++ b/htdocs/core/tpl/objectline_create.tpl.php @@ -515,8 +515,14 @@ jQuery(document).ready(function() { setforfree(); if (jQuery('#select_type').val() >= 0) { - /* focus work on a standard textarea */ + /* focus work on a standard textarea but not if field was replaced with CKEDITOR */ jQuery('#dp_desc').focus(); + /* focus if CKEDITOR */ + if (typeof(CKEDITOR) !== 'undefined') + { + var editor = CKEDITOR.instances['dp_desc']; + if (editor) { editor.focus(); } + } } if (jQuery('#select_type').val() == '0') jQuery('#trlinefordates').hide(); else jQuery('#trlinefordates').show(); @@ -615,8 +621,14 @@ jQuery(document).ready(function() { /* To set focus */ if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0) { - /* focus work on a standard textarea */ + /* focus work on a standard textarea but not if field was replaced with CKEDITOR */ jQuery('#dp_desc').focus(); + /* focus if CKEDITOR */ + if (typeof(CKEDITOR) !== 'undefined') + { + var editor = CKEDITOR.instances['dp_desc']; + if (editor) { editor.focus(); } + } } });