Merge pull request #14 from techdivision/bugfix/blockstyles

Bugfix: Combining Blockstyles

README.md

@@ -82,8 +82,6 @@ Example: [Configuration/Settings.yaml](Configuration/Settings.yaml)
 
 _Note: Using an empty class (cssClass: null) to unset the value might cause errors during rendering in the backend.
  The select boxes of this package contain an "x" button for resetting the value._  
-_BlockStyles cannot be combined at the moment. Other than InlineStyles, you can only set one blockstyle per block._
-
 
 Activate the preset for your inline editable NodeType property:
 

Resources/Private/JavaScript/CkStyles/src/BlockStyleEditing.js

@@ -10,13 +10,13 @@ export default (presetIdentifier, presetConfiguration) =>
         init() {
             this.editor.model.schema.extend(
                 '$block',
-                { allowAttributes: `blockStyles:${presetIdentifier}`}
+                { allowAttributes: `blockStyles-${presetIdentifier}`}
             );
 
             // Model configuration
             const config = {
                 model: {
-                    key: `blockStyles:${presetIdentifier}`,
+                    key: `blockStyles-${presetIdentifier}`,
                     values: Object.keys(presetConfiguration.options),
                 },
                 view: {}
@@ -33,6 +33,6 @@ export default (presetIdentifier, presetConfiguration) =>
             // Convert the model to view correctly
             this.editor.conversion.attributeToAttribute(config);
 
-            this.editor.commands.add(`blockStyles:${presetIdentifier}`, new BlockStyleCommand(this.editor, `blockStyles:${presetIdentifier}`));
+            this.editor.commands.add(`blockStyles:${presetIdentifier}`, new BlockStyleCommand(this.editor, `blockStyles-${presetIdentifier}`));
         }
     }

Resources/Private/JavaScript/CkStyles/src/InlineStylesEditing.js

@@ -10,13 +10,13 @@ export default (presetIdentifier, presetConfiguration) =>
         init() {
             this.editor.model.schema.extend(
                 '$text', 
-                { allowAttributes: `inlineStyles:${presetIdentifier}` }
+                { allowAttributes: `inlineStyles-${presetIdentifier}` }
             );
 
             // Model configuration
             const config = {
                 model: {
-                    key: `inlineStyles:${presetIdentifier}`,
+                    key: `inlineStyles-${presetIdentifier}`,
                     values: Object.keys(presetConfiguration.options),
                 },
                 view: {}
@@ -33,6 +33,6 @@ export default (presetIdentifier, presetConfiguration) =>
             // Convert the model to view correctly
             this.editor.conversion.attributeToElement(config);
 
-            this.editor.commands.add(`inlineStyles:${presetIdentifier}`, new InlineStylesCommand(this.editor, `inlineStyles:${presetIdentifier}`));
+            this.editor.commands.add(`inlineStyles:${presetIdentifier}`, new InlineStylesCommand(this.editor, `inlineStyles-${presetIdentifier}`));
         }
     }