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

Focus on textarea works also when ckeditor is on

Browse Source
This commit is contained in:
Laurent Destailleur 2015-11-21 13:42:01 +01:00
parent 2a345b6fc0
commit 548ff26628
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/core/tpl/objectline_create.tpl.php
View File

@ -138,7 +138,8 @@ else {
// Show type selector // Show type selector
if ($forceall >= 0) if ($forceall >= 0)
{ {
echo $langs->trans("FreeLineOfType"); if (empty($conf->product->enabled) || empty($conf->service->enabled)) echo $langs->trans("Type");
else echo $langs->trans("FreeLineOfType");
echo ' '; echo ' ';
} }
} }
@ -512,7 +513,17 @@ jQuery(document).ready(function() {
$("#select_type").change(function() $("#select_type").change(function()
{ {
setforfree(); setforfree();
if (jQuery('#select_type').val() >= 0) jQuery('#dp_desc').focus(); if (jQuery('#select_type').val() >= 0)
{
/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
jQuery('#dp_desc').focus();
/* focus if CKEDITOR */
if (CKEDITOR)
{
var editor = CKEDITOR.instances['dp_desc'];
if (editor) { editor.focus(); }
}
}
if (jQuery('#select_type').val() == '0') jQuery('#trlinefordates').hide(); if (jQuery('#select_type').val() == '0') jQuery('#trlinefordates').hide();
else jQuery('#trlinefordates').show(); else jQuery('#trlinefordates').show();
}); });
@ -608,8 +619,17 @@ jQuery(document).ready(function() {
<?php } ?> <?php } ?>
/* To set focus */ /* To set focus */
if (jQuery('#idprod').val() > 0) jQuery('#dp_desc').focus(); if (jQuery('#idprod').val() > 0 || jQuery('#idprodfournprice').val() > 0)
if (jQuery('#idprodfournprice').val() > 0) jQuery('#dp_desc').focus(); {
/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
jQuery('#dp_desc').focus();
/* focus if CKEDITOR */
if (CKEDITOR)
{
var editor = CKEDITOR.instances['dp_desc'];
if (editor) { editor.focus(); }
}
}
}); });
<?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef ?> <?php if (GETPOST('prod_entry_mode') == 'predef') { // When we submit with a predef product and it fails we must start with predef ?>