Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-769: Reorder and hide for CKEditor toolbar groups and buttons, CustomStyleInline button support #203

Merged
merged 9 commits into from
Oct 13, 2021
Merged

IBX-769: Reorder and hide for CKEditor toolbar groups and buttons, CustomStyleInline button support #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
decb481
IBX-769: Extensibility for Online Editor
damianz5 Aug 18, 2021
e1a36da
Added custom_tags_group, updated tests
damianz5 Aug 31, 2021
f3e1990
Fixed docblock for cs-fixer
damianz5 Sep 1, 2021
acef61c
CR changes
damianz5 Sep 6, 2021
87bebbb
Fixed tests, reorganized CKEditor custom styles logic.
damianz5 Sep 24, 2021
0f51d5b
added extensibility point for extra plugins
dew326 Sep 27, 2021
9453640
Fixed customStylesConfiguration parameter injection
damianz5 Oct 8, 2021
70f37ca
Fixed cs
damianz5 Oct 8, 2021
499a8bc
Fixed usage of TestCase class
damianz5 Oct 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/bundle/DependencyInjection/Configuration/Parser/FieldType/RichText.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ class RichText extends AbstractFieldTypeParser
private const ATTRIBUTE_TYPE_STRING = 'string';
private const ATTRIBUTE_TYPE_NUMBER = 'number';

private const TOOLBARS_NODE_KEY = 'toolbars';
public const TOOLBARS_SA_SETTINGS_ID = 'fieldtypes.ezrichtext.' . self::TOOLBARS_NODE_KEY;
private const TOOLBAR_NODE_KEY = 'toolbar';
public const TOOLBARS_SA_SETTINGS_ID = 'fieldtypes.ezrichtext.' . self::TOOLBAR_NODE_KEY;

// constants common for OE custom classes and data attributes configuration
private const ELEMENT_NODE_KEY = 'element';
Expand Down Expand Up @@ -193,11 +193,19 @@ public function addFieldTypeSemanticConfig(NodeBuilder $nodeBuilder)

// RichText Toolbars configuration (defines list of Toolbars and Buttons enabled for current SiteAccess scope)
$nodeBuilder
->arrayNode(self::TOOLBARS_NODE_KEY)
->useAttributeAsKey('name')
->info('List of Toolbars and Buttons enabled for current SiteAccess scope.')
->arrayNode(self::TOOLBAR_NODE_KEY)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This BC break needs to be mentioned in upgrade notes @ezsystems/documentation-team

->useAttributeAsKey('group_name')
->info('List of grouped Toolbars and Buttons enabled for current SiteAccess scope.')
->prototype('array')
->children()
->booleanNode('visible')
->info('Is group visible on toolbar?')
->defaultTrue()
->end()
->integerNode('priority')
->info('Defines order in which group appear (255 .. -255).')
->defaultValue(0)
->end()
->arrayNode('buttons')
->useAttributeAsKey('name')
->prototype('array')
Expand Down Expand Up @@ -265,7 +273,7 @@ public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerIn
$onlineEditorSettingsMap = [
self::CLASSES_NODE_KEY => self::CLASSES_SA_SETTINGS_ID,
self::ATTRIBUTES_NODE_KEY => self::ATTRIBUTES_SA_SETTINGS_ID,
self::TOOLBARS_NODE_KEY => self::TOOLBARS_SA_SETTINGS_ID,
self::TOOLBAR_NODE_KEY => self::TOOLBARS_SA_SETTINGS_ID,
];
foreach ($onlineEditorSettingsMap as $key => $settingsId) {
if (isset($scopeSettings['fieldtypes']['ezrichtext'][$key])) {
Expand Down
4 changes: 4 additions & 0 deletions src/bundle/Resources/config/configuration.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ services:
arguments:
$alloyEditorConfiguration: '%ezplatform.ezrichtext.alloy_editor%'

EzSystems\EzPlatformRichText\Configuration\Provider\CKEditor:
arguments:
$customStylesConfiguration: '%ezplatform.ezrichtext.custom_styles%'

EzSystems\EzPlatformRichText\Configuration\AggregateProvider:
arguments:
$providers: !tagged ezplatform.ezrichtext.configuration.provider
Loading