From ceb2920769fa561ba5dbe08dca48d07b791fab2c Mon Sep 17 00:00:00 2001
From: Ion Agorria <ion@agorria.com>
Date: Thu, 10 Dec 2015 14:17:08 +0100
Subject: [PATCH] Better undefined CKEDITOR fix
---
htdocs/core/tpl/objectline_create.tpl.php | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 6c507d55910..176c70e4a5a 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(); }
+ }
}
});
--
GitLab