Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2012-08-27 14:11:58 +02:00
parent 1255699791 6426ef3f8d
commit b57de4fbac
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/ajax.lib.php
View File

@@ -136,7 +136,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
}
if (ui.item.textarea) {
$.each(ui.item.textarea, function(key, value) {
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined") {
if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined" && CKEDITOR.instances["product_desc"] != "undefined") {
CKEDITOR.instances[key].setData(value);
CKEDITOR.instances[key].focus();
} else {

6
htdocs/core/tpl/objectline_add.tpl.php
View File

@@ -219,7 +219,7 @@ $(document).ready(function() {
$('#idprod').change(function() {
if ($(this).val().length > 0) {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined') {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined' && CKEDITOR.instances['product_desc'] != 'undefined') {
// We use CKEditor
CKEDITOR.instances['product_desc'].focus();
} else {
@@ -338,7 +338,7 @@ $(document).ready(function() {
var origin_desc = $('#origin_desc_cache').val();
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined') {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined' && CKEDITOR.instances['product_desc'] != 'undefined') {
// We use CKEditor
var freecontent = CKEDITOR.instances['product_desc'].getData();
if (origin_desc.length > 0)
@@ -360,7 +360,7 @@ $(document).ready(function() {
var content = $('#free_desc_cache').val();
}
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined') {
if (typeof CKEDITOR == 'object' && typeof CKEDITOR.instances != 'undefined' && CKEDITOR.instances['product_desc'] != 'undefined') {
// We use CKEditor
CKEDITOR.instances['product_desc'].setData(content);
} else {