Skip to content

Commit

Permalink
Update to Froala 2.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Simon Guionniere committed Nov 15, 2016
1 parent 7c4b5e6 commit 5218f92
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 41 deletions.
1 change: 1 addition & 0 deletions Service/PluginProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class PluginProvider
"file" => [ PluginProvider::KEY_CSS => 1 ],
"font_family" => [ PluginProvider::KEY_CSS => 0 ],
"font_size" => [ PluginProvider::KEY_CSS => 0 ],
// "forms" => [ PluginProvider::KEY_CSS => 0 ],
"fullscreen" => [ PluginProvider::KEY_CSS => 1 ],
"image" => [ PluginProvider::KEY_CSS => 1 ],
"image_manager" => [ PluginProvider::KEY_CSS => 1 ],
Expand Down
86 changes: 45 additions & 41 deletions Utility/UConfiguration.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ abstract class UConfiguration
"imageResize" => null, //
"imageResizeWithPercent" => null, //
"imageRoundPercent" => null, //
"imageSplitHTML" => null, //
"imageSplitHTML" => null, //
"imageTextNear" => null, //
"imageOutputSize" => null, //
"imagePasteProcess" => null, //
Expand All @@ -49,21 +49,23 @@ abstract class UConfiguration
"paragraphMultipleStyles" => null, //
"pasteAllowLocalImages" => null, //
"pastePlain" => null, //
"requestWithCredentials" => null, //
"requestWithCORS" => null, //
"shortcutsHint" => null, //
"spellcheck" => null, //
"tableCellMultipleStyles" => null, //
"tableMultipleStyles" => null, //
"tableResizer" => null, //
"tableResizer" => null, //
"toolbarBottom" => null, //
"toolbarContainer" => null, //
"toolbarInline" => null, //
"toolbarSticky" => null, //
"toolbarVisibleWithoutSelection" => null, //
"tooltips" => null, //
"useClasses" => null, //
"videoMove" => null, //
"videoResize" => null, //
"videoSplitHTML" => null, //
"videoSplitHTML" => null, //
"videoTextNear" => null
);

Expand Down Expand Up @@ -133,52 +135,54 @@ abstract class UConfiguration
);

public static $OPTIONS_STRING_CUSTOM = array(
"basePath" => "/bundles/kmsfroalaeditor/froala_editor_2.3.4", //
"basePath" => "/bundles/kmsfroalaeditor/froala_editor_2.3.5", //
"imageUploadFolder" => "/upload", //
"imageUploadPath" => null, //
"fileUploadFolder" => "/upload", //
"fileUploadPath" => null, //
"serialNumber" => null, //
"customJS" => null
"customJS" => null
);

public static $OPTIONS_ARRAY = array(
"colorsBackground" => array(), //
"colorsText" => array(), //
"emoticonsSet" => array(), //
"fileAllowedTypes" => array(), //
"fontSize" => array(), //
"htmlAllowedAttrs" => array(), //
"htmlAllowedEmptyTags" => array(), //
"htmlAllowedTags" => array(), //
"htmlDoNotWrapTags" => array(), //
"htmlRemoveTags" => array(), //
"iframeStyleFiles" => array(), //
"imageAllowedTypes" => array(), //
"imageAltButtons" => array(), //
"imageEditButtons" => array(), //
"imageInsertButtons" => array(), //
"imageSizeButtons" => array(), //
"lineBreakerTags" => array(), //
"linkEditButtons" => array(), //
"linkInsertButtons" => array(), //
"linkList" => array(), //
"pasteDeniedAttrs" => array(), //
"pasteDeniedTags" => array(), //
"pluginsEnabled" => array(), //
"quickInsertTags" => array(), //
"shortcutsEnabled" => array(), //
"tableColors" => array(), //
"tableColorsButtons" => array(), //
"tableEditButtons" => array(), //
"tableInsertButtons" => array(), //
"toolbarButtons" => array(), //
"toolbarButtonsMD" => array(), //
"toolbarButtonsSM" => array(), //
"toolbarButtonsXS" => array(), //
"videoEditButtons" => array(), //
"videoInsertButtons" => array(), //
"videoSizeButtons" => array()
"codeViewKeepActiveButtons" => array(), //
"colorsBackground" => array(), //
"colorsText" => array(), //
"emoticonsSet" => array(), //
"fileAllowedTypes" => array(), //
"fontSize" => array(), //
"htmlAllowedAttrs" => array(), //
"htmlAllowedEmptyTags" => array(), //
"htmlAllowedTags" => array(), //
"htmlIgnoreCSSProperties" => array(), //
"htmlDoNotWrapTags" => array(), //
"htmlRemoveTags" => array(), //
"iframeStyleFiles" => array(), //
"imageAllowedTypes" => array(), //
"imageAltButtons" => array(), //
"imageEditButtons" => array(), //
"imageInsertButtons" => array(), //
"imageSizeButtons" => array(), //
"lineBreakerTags" => array(), //
"linkEditButtons" => array(), //
"linkInsertButtons" => array(), //
"linkList" => array(), //
"pasteDeniedAttrs" => array(), //
"pasteDeniedTags" => array(), //
"pluginsEnabled" => array(), //
"quickInsertTags" => array(), //
"shortcutsEnabled" => array(), //
"tableColors" => array(), //
"tableColorsButtons" => array(), //
"tableEditButtons" => array(), //
"tableInsertButtons" => array(), //
"toolbarButtons" => array(), //
"toolbarButtonsMD" => array(), //
"toolbarButtonsSM" => array(), //
"toolbarButtonsXS" => array(), //
"videoEditButtons" => array(), //
"videoInsertButtons" => array(), //
"videoSizeButtons" => array()
);

public static $OPTIONS_ARRAY_CUSTOM = array(
Expand Down

0 comments on commit 5218f92

Please sign in to comment.