lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests 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) { if (ui.item.textarea) {
$.each(ui.item.textarea, function(key, value) { $.each(ui.item.textarea, function(key, value) {';
if (typeof CKEDITOR == "object") { if (! empty($conf->fckeditor->enabled) && ! empty($conf->global->FCKEDITOR_ENABLE_DETAILS)) {
CKEDITOR.instances[key].setData(value); $script.= ' // We use CKEditor
CKEDITOR.instances[key].focus(); CKEDITOR.instances[key].setData(value);
} else { CKEDITOR.instances[key].focus();';
$("#" + key).html(value); } else {
$("#" + key).focus(); $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 } ?> <?php } ?>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
@ -220,11 +219,13 @@ $(document).ready(function() {
$('#idprod').change(function() { $('#idprod').change(function() {
if ($(this).val().length > 0) 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(); CKEDITOR.instances['product_desc'].focus();
} else { <?php } else { ?>
// We use a simple textarea
$('#product_desc').focus(); $('#product_desc').focus();
} <?php } ?>
} else { } else {
$('#update_desc_checkbox').removeAttr('checked').trigger('change'); $('#update_desc_checkbox').removeAttr('checked').trigger('change');
@ -336,19 +337,21 @@ $(document).ready(function() {
var origin_desc = $('#origin_desc_cache').val(); 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(); 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;
else else
var content = freecontent; var content = freecontent;
} else { <?php } else { ?>
// We use a simple textarea
var freecontent = $('#product_desc').html(); var freecontent = $('#product_desc').html();
if (origin_desc.length > 0) if (origin_desc.length > 0)
var content = origin_desc + '\r\n' + freecontent; var content = origin_desc + '\r\n' + freecontent;
else else
var content = freecontent; var content = freecontent;
} <?php } ?>
$('#free_desc_cache').val(freecontent); $('#free_desc_cache').val(freecontent);
@ -356,11 +359,13 @@ $(document).ready(function() {
var content = $('#free_desc_cache').val(); 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); CKEDITOR.instances['product_desc'].setData(content);
} else { <?php } else { ?>
// We use a simple textarea
$('#product_desc').html(content); $('#product_desc').html(content);
} <?php } ?>
}); });
$('#price_ht').focusin(function() { $('#price_ht').focusin(function() {