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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-26 22:36:21 +02:00
commit d8e162c309
2 changed files with 4 additions and 4 deletions
Show Stats 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) { if (ui.item.textarea) {
$.each(ui.item.textarea, function(key, value) { $.each(ui.item.textarea, function(key, value) {
if (CKEDITOR) { if (typeof CKEDITOR == "object") {
CKEDITOR.instances[key].setData(value); CKEDITOR.instances[key].setData(value);
CKEDITOR.instances[key].focus(); CKEDITOR.instances[key].focus();
} else { } else {

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

@ -220,7 +220,7 @@ $(document).ready(function() {
$('#idprod').change(function() { $('#idprod').change(function() {
if ($(this).val().length > 0) if ($(this).val().length > 0)
{ {
if (CKEDITOR) { if (typeof CKEDITOR == 'object') {
CKEDITOR.instances['product_desc'].focus(); CKEDITOR.instances['product_desc'].focus();
} else { } else {
$('#product_desc').focus(); $('#product_desc').focus();
@ -336,7 +336,7 @@ $(document).ready(function() {
var origin_desc = $('#origin_desc_cache').val(); var origin_desc = $('#origin_desc_cache').val();
if (CKEDITOR) { if (typeof CKEDITOR == 'object') {
var freecontent = CKEDITOR.instances['product_desc'].getData(); var freecontent = CKEDITOR.instances['product_desc'].getData();
if (origin_desc.length > 0) if (origin_desc.length > 0)
var content = origin_desc + '<br />' + freecontent; var content = origin_desc + '<br />' + freecontent;
@ -356,7 +356,7 @@ $(document).ready(function() {
var content = $('#free_desc_cache').val(); var content = $('#free_desc_cache').val();
} }
if (CKEDITOR) { if (typeof CKEDITOR == 'object') {
CKEDITOR.instances['product_desc'].setData(content); CKEDITOR.instances['product_desc'].setData(content);
} else { } else {
$('#product_desc').html(content); $('#product_desc').html(content);