Merge branch 'master' into dev10

This commit is contained in:
Fred Tempez 2020-03-22 16:45:43 +01:00
commit 2fdb566fe1
3 changed files with 10 additions and 10 deletions

View File

@ -47,8 +47,8 @@ tinymce.init({
cssFiles: [ cssFiles: [
/*'theme/ambiance.css',*/ /*'theme/ambiance.css',*/
], ],
width: 1000, // Default value is 800 width: 800, // Default value is 800
height: 600 // Default value is 550 height: 500 // Default value is 550
}, },
// Cibles de la target // Cibles de la target
target_list: [ target_list: [

View File

@ -3,6 +3,6 @@ tinymce.addI18n('fr_FR',{
'Start search': 'Rechercher', 'Start search': 'Rechercher',
'Find next': 'Chercher suiv.', 'Find next': 'Chercher suiv.',
'Find previous': 'Chercher préc.', 'Find previous': 'Chercher préc.',
'Replace': 'Replace', 'Replace': 'Remplacer',
'Replace all': 'Replace all' 'Replace all': 'Remplacer tout'
}); });

View File

@ -148,7 +148,7 @@ function start()
div = parent.document.createElement('div'), div = parent.document.createElement('div'),
td1 = '<td style="font-size:11px;background:#777;color:#fff;padding:0 4px">', td1 = '<td style="font-size:11px;background:#777;color:#fff;padding:0 4px">',
td2 = '<td style="font-size:11px;padding-right:5px">'; td2 = '<td style="font-size:11px;padding-right:5px">';
div.innerHTML = '<table cellspacing="0" cellpadding="0" style="border-spacing:4px"><tr>' + td1 + (isMac ? '&#8984;-F' : 'Ctrl-F</td>') + td2 + tinymce.translate('Start search') + '</td>' + td1 + (isMac ? '&#8984;-G' : 'Ctrl-G') + '</td>' + td2 + tinymce.translate('Find next') + '</td>' + td1 + (isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Find previous') + '</td></tr>' + '<tr>' + td1 + (isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Replace') + '</td>' + td1 + (isMac ? 'Shift-&#8984;-Alt-F' : 'Shift-Ctrl-R') +'</td>' + td2 + tinymce.translate('Replace all') + '</td></tr></table>'; div.innerHTML = '<table cellspacing="0" cellpadding="0" style="border-spacing:4px"><tr>' + td1 + (isMac ? '&#8984;-F' : 'Ctrl-F</td>') + td2 + tinymce.translate('Start search') + '</td>' + td1 + (isMac ? '&#8984;-G' : 'Ctrl-G') + '</td>' + td2 + tinymce.translate('Find next') + '</td>' + td1 + (isMac ? '&#8984;-Alt-G' : 'Shift-Ctrl-G') + '</td>' + td2 + tinymce.translate('Find previous') + '</td></tr>' + '<tr>' + td1 + (isMac ? '&#8984;-Alt-F' : 'Shift-Ctrl-F') + '</td>' + td2 + tinymce.translate('Replace') + '</td>' + td1 + (isMac ? 'Shift-&#8984;-Alt-F' : 'Shift-Ctrl-R') +'</td>' + td2 + tinymce.translate('Replace all') + '</td></tr></table>';
div.style.position = 'absolute'; div.style.position = 'absolute';
div.style.left = div.style.bottom = '5px'; div.style.left = div.style.bottom = '5px';
head.appendChild(div); head.appendChild(div);