Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition of usage of ckeditor

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-27 13:07:25 +02:00
parent 9570e03b1e
commit 0bdb9aac31
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,14 +135,17 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption='', $minLengt
});
}
if (ui.item.textarea) {
$.each(ui.item.textarea, function(key, value) {
if (typeof CKEDITOR == "object") {
CKEDITOR.instances[key].setData(value);
CKEDITOR.instances[key].focus();
} else {
$("#" + key).html(value);
$("#" + key).focus();
}
$.each(ui.item.textarea, function(key, value) {';
if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
$script.= ' // We use CKEditor
CKEDITOR.instances[key].setData(value);
CKEDITOR.instances[key].focus();';
} else {
$script.= ' // We use a simple textarea
$("#" + key).html(value);
$("#" + key).focus();';
}
$script.='
});
}
}

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

@ -211,7 +211,6 @@ if (! empty($conf->margin->enabled)) {
<?php } ?>
</form>
<script type="text/javascript">
$(document).ready(function() {
@ -220,11 +219,13 @@ $(document).ready(function() {
$('#idprod').change(function() {
if ($(this).val().length > 0)
{
if (typeof CKEDITOR == 'object') {
<?php if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
// We use CKEditor
CKEDITOR.instances['product_desc'].focus();
} else {
<?php } else { ?>
// We use a simple textarea
$('#product_desc').focus();
}
<?php } ?>
} else {
$('#update_desc_checkbox').removeAttr('checked').trigger('change');
@ -336,19 +337,21 @@ $(document).ready(function() {
var origin_desc = $('#origin_desc_cache').val();
if (typeof CKEDITOR == 'object') {
<?php if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
// We use CKEditor
var freecontent = CKEDITOR.instances['product_desc'].getData();
if (origin_desc.length > 0)
var content = origin_desc + '<br />' + freecontent;
else
var content = freecontent;
} else {
<?php } else { ?>
// We use a simple textarea
var freecontent = $('#product_desc').html();
if (origin_desc.length > 0)
var content = origin_desc + '\r\n' + freecontent;
else
var content = freecontent;
}
<?php } ?>
$('#free_desc_cache').val(freecontent);
@ -356,11 +359,13 @@ $(document).ready(function() {
var content = $('#free_desc_cache').val();
}
if (typeof CKEDITOR == 'object') {
<?php if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) { ?>
// We use CKEditor
CKEDITOR.instances['product_desc'].setData(content);
} else {
<?php } else { ?>
// We use a simple textarea
$('#product_desc').html(content);
}
<?php } ?>
});
$('#price_ht').focusin(function() {