Merge 9.2.09
This commit is contained in:
commit
318778bb54
10
core/vendor/tinymce/init.js
vendored
10
core/vendor/tinymce/init.js
vendored
@ -5,11 +5,11 @@ tinymce.init({
|
|||||||
// Classe où appliquer l'éditeur
|
// Classe où appliquer l'éditeur
|
||||||
selector: ".editorWysiwyg",
|
selector: ".editorWysiwyg",
|
||||||
// Aperçu dans le pied de page
|
// Aperçu dans le pied de page
|
||||||
setup:function(ed) {
|
// setup:function(ed) {
|
||||||
ed.on('change', function(e) {
|
// ed.on('change', function(e) {
|
||||||
$("#footerText").html(ed.getContent());
|
// $("#footerText").html(ed.getContent());
|
||||||
});
|
// });
|
||||||
},
|
//},
|
||||||
// Langue
|
// Langue
|
||||||
language: "fr_FR",
|
language: "fr_FR",
|
||||||
// Plugins
|
// Plugins
|
||||||
|
@ -32,7 +32,7 @@ class form extends common {
|
|||||||
|
|
||||||
public static $pagination;
|
public static $pagination;
|
||||||
|
|
||||||
const FORM_VERSION = '1.9';
|
const FORM_VERSION = '2.0';
|
||||||
|
|
||||||
const TYPE_MAIL = 'mail';
|
const TYPE_MAIL = 'mail';
|
||||||
const TYPE_SELECT = 'select';
|
const TYPE_SELECT = 'select';
|
||||||
@ -88,6 +88,8 @@ class form extends common {
|
|||||||
'subject' => $this->getInput('formConfigSubject')
|
'subject' => $this->getInput('formConfigSubject')
|
||||||
]
|
]
|
||||||
]);
|
]);
|
||||||
|
// Génération des données vides
|
||||||
|
$this->setData(['module', $this->getUrl(0), 'data', []]);
|
||||||
// Génération des champs
|
// Génération des champs
|
||||||
$inputs = [];
|
$inputs = [];
|
||||||
foreach($this->getInput('formConfigPosition', null) as $index => $position) {
|
foreach($this->getInput('formConfigPosition', null) as $index => $position) {
|
||||||
@ -379,4 +381,4 @@ class form extends common {
|
|||||||
'view' => 'index',
|
'view' => 'index',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user