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

Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1

Browse Source
This commit is contained in:
Regis Houssin 2012-07-03 16:43:42 +02:00
commit ab6129a1cc
1 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/js/editinplace.js
View File

@ -69,6 +69,7 @@ $(document).ready(function() {
$('#editval_' + $(this).attr('id')).show().click(); $('#editval_' + $(this).attr('id')).show().click();
}); });
if (typeof ckeditorConfig != 'undefined') {
$('.editval_ckeditor').editable(urlSaveInPlace, { $('.editval_ckeditor').editable(urlSaveInPlace, {
type : 'ckeditor', type : 'ckeditor',
id : 'field', id : 'field',
@ -117,6 +118,7 @@ $(document).ready(function() {
$('#viewval_' + $(this).attr('id')).hide(); $('#viewval_' + $(this).attr('id')).hide();
$('#editval_' + $(this).attr('id')).show().click(); $('#editval_' + $(this).attr('id')).show().click();
}); });
}
$('.editval_string').editable(urlSaveInPlace, { $('.editval_string').editable(urlSaveInPlace, {
type : 'text', type : 'text',