From efa471b12bb426d7b9b8c324a9a2bdcdd2bb932c Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sun, 26 Aug 2012 21:47:56 +0200
Subject: [PATCH] Fix: test if ckeditor is enabled
---
htdocs/core/lib/ajax.lib.php | 2 +-
htdocs/core/tpl/objectline_add.tpl.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 5134dc5ff42..8b0614a1b42 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -136,7 +136,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
}
if (ui.item.textarea) {
$.each(ui.item.textarea, function(key, value) {
- if (CKEDITOR) {
+ if (typeof CKEDITOR == "object") {
CKEDITOR.instances[key].setData(value);
CKEDITOR.instances[key].focus();
} else {
diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php
index 0d77921949c..a1f8ecbda40 100644
--- a/htdocs/core/tpl/objectline_add.tpl.php
+++ b/htdocs/core/tpl/objectline_add.tpl.php
@@ -220,7 +220,7 @@ $(document).ready(function() {
$('#idprod').change(function() {
if ($(this).val().length > 0)
{
- if (CKEDITOR) {
+ if (typeof CKEDITOR == 'object') {
CKEDITOR.instances['product_desc'].focus();
} else {
$('#product_desc').focus();
@@ -336,7 +336,7 @@ $(document).ready(function() {
var origin_desc = $('#origin_desc_cache').val();
- if (CKEDITOR) {
+ if (typeof CKEDITOR == 'object') {
var freecontent = CKEDITOR.instances['product_desc'].getData();
if (origin_desc.length > 0)
var content = origin_desc + '<br />' + freecontent;
@@ -356,7 +356,7 @@ $(document).ready(function() {
var content = $('#free_desc_cache').val();
}
- if (CKEDITOR) {
+ if (typeof CKEDITOR == 'object') {
CKEDITOR.instances['product_desc'].setData(content);
} else {
$('#product_desc').html(content);
--
GitLab