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

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

@ -68,55 +68,57 @@ $(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_ckeditor').editable(urlSaveInPlace, { if (typeof ckeditorConfig != 'undefined') {
type : 'ckeditor', $('.editval_ckeditor').editable(urlSaveInPlace, {
id : 'field', type : 'ckeditor',
onblur : 'ignore', id : 'field',
tooltip : tooltipInPlace, onblur : 'ignore',
placeholder : ' ', tooltip : tooltipInPlace,
cancel : cancelInPlace, placeholder : ' ',
submit : submitInPlace, cancel : cancelInPlace,
indicator : indicatorInPlace, submit : submitInPlace,
ckeditor : { indicator : indicatorInPlace,
customConfig: ckeditorConfig, ckeditor : {
toolbar: $('#ckeditor_toolbar').val(), customConfig: ckeditorConfig,
filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl, toolbar: $('#ckeditor_toolbar').val(),
filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl, filebrowserBrowseUrl : ckeditorFilebrowserBrowseUrl,
filebrowserWindowWidth : '900', filebrowserImageBrowseUrl : ckeditorFilebrowserImageBrowseUrl,
filebrowserWindowHeight : '500', filebrowserWindowWidth : '900',
filebrowserImageWindowWidth : '900', filebrowserWindowHeight : '500',
filebrowserImageWindowHeight : '500' filebrowserImageWindowWidth : '900',
}, filebrowserImageWindowHeight : '500'
submitdata : function(result, settings) {
return getParameters(this, 'ckeditor');
},
callback : function(result, settings) {
getResult(this, result);
},
onreset : function(result, settings) {
getDefault(settings);
}
});
$('.editkey_ckeditor').hover(
function () {
$('#viewval_' + $(this).attr('id')).addClass("viewval_hover");
}, },
function () { submitdata : function(result, settings) {
$('#viewval_' + $(this).attr('id')).removeClass("viewval_hover"); return getParameters(this, 'ckeditor');
},
callback : function(result, settings) {
getResult(this, result);
},
onreset : function(result, settings) {
getDefault(settings);
} }
); });
$('.editkey_ckeditor').click(function() { $('.editkey_ckeditor').hover(
$( '#viewval_' + $(this).attr('id') ).click(); function () {
}); $('#viewval_' + $(this).attr('id')).addClass("viewval_hover");
$('.viewval_ckeditor.active').click(function() { },
$('#viewval_' + $(this).attr('id').substr(8)).hide(); function () {
$('#editval_' + $(this).attr('id').substr(8)).show().click(); $('#viewval_' + $(this).attr('id')).removeClass("viewval_hover");
}); }
$('.editkey_ckeditor').click(function() { );
$('#viewval_' + $(this).attr('id')).hide(); $('.editkey_ckeditor').click(function() {
$('#editval_' + $(this).attr('id')).show().click(); $( '#viewval_' + $(this).attr('id') ).click();
}); });
$('.viewval_ckeditor.active').click(function() {
$('#viewval_' + $(this).attr('id').substr(8)).hide();
$('#editval_' + $(this).attr('id').substr(8)).show().click();
});
$('.editkey_ckeditor').click(function() {
$('#viewval_' + $(this).attr('id')).hide();
$('#editval_' + $(this).attr('id')).show().click();
});
}
$('.editval_string').editable(urlSaveInPlace, { $('.editval_string').editable(urlSaveInPlace, {
type : 'text', type : 'text',