merge master

This commit is contained in:
Hadi Nategh
2020-03-05 14:45:25 +01:00
79 changed files with 3527 additions and 411 deletions

View File

@ -114,7 +114,7 @@ var et2_htmlarea = /** @class */ (function (_super) {
valid_children: this.options.valid_children,
plugins: [
"print searchreplace autolink directionality ",
"visualblocks visualchars image link media template ",
"visualblocks visualchars image link media template fullscreen",
"codesample table charmap hr pagebreak nonbreaking anchor toc ",
"insertdatetime advlist lists textcolor wordcount imagetools ",
"colorpicker textpattern help paste code searchreplace tabfocus"
@ -440,14 +440,14 @@ var et2_htmlarea = /** @class */ (function (_super) {
*/
et2_htmlarea.TOOLBAR_EXTENDED = "fontselect fontsizeselect | bold italic strikethrough forecolor backcolor | " +
"link | alignleft aligncenter alignright alignjustify | numlist " +
"bullist outdent indent | removeformat | image";
"bullist outdent indent | removeformat | image | fullscreen";
/**
* arranged toolbars as advanced mode
* @constant
*/
et2_htmlarea.TOOLBAR_ADVANCED = "undo redo| formatselect | fontselect fontsizeselect | bold italic strikethrough forecolor backcolor | " +
"link | alignleft aligncenter alignright alignjustify | numlist " +
"bullist outdent indent ltr rtl | removeformat code| image | searchreplace";
"bullist outdent indent ltr rtl | removeformat code| image | searchreplace | fullscreen";
/**
* font size formats
* @constant