Allow drupal-entity elements to be inline

config/install/entity_embed.settings.yml

@@ -0,0 +1 @@
+inline: false

config/schema/entity_embed.schema.yml

@@ -1,5 +1,13 @@
 # Schema for the configuration files of the Entity Embed module.
 
+entity_embed.settings:
+  type: config_object
+  label: 'Entity Embed settings'
+  mapping:
+    inline:
+      type: boolean
+      label: 'Allow inline embedded entities'
+
 embed.embed_type_settings.entity:
   type: mapping
   label: 'Schema for the entity embed type additions to an embed button entity'

js/plugins/drupalentity/plugin.js

@@ -18,9 +18,10 @@
       var dtd = CKEDITOR.dtd, tagName;
       dtd['drupal-entity'] = {'#': 1};
       // Register drupal-entity element as allowed child, in each tag that can
-      // contain a div element.
+      // contain a div or img element (if inline embedding is turned on in the
+      // settings).
       for (tagName in dtd) {
-        if (dtd[tagName].div) {
+        if (dtd[tagName].div || (dtd[tagName].img && editor.config.DrupalEntity_inline)) {
           dtd[tagName]['drupal-entity'] = 1;
         }
       }

src/Plugin/CKEditorPlugin/DrupalEntity.php

@@ -10,6 +10,7 @@
 use Drupal\editor\Entity\Editor;
 use Drupal\embed\EmbedButtonInterface;
 use Drupal\embed\EmbedCKEditorPluginBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the "drupalentity" plugin.
@@ -22,6 +23,17 @@
  */
 class DrupalEntity extends EmbedCKEditorPluginBase {
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    $configuration['inline'] = $container->get('config.factory')
+      ->get('entity_embed.settings')
+      ->get('inline');
+
+    return parent::create($container, $configuration, $plugin_id, $plugin_definition);
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -46,6 +58,7 @@ public function getConfig(Editor $editor) {
       'DrupalEntity_dialogTitleAdd' => t('Insert entity'),
       'DrupalEntity_dialogTitleEdit' => t('Edit entity'),
       'DrupalEntity_buttons' => $this->getButtons(),
+      'DrupalEntity_inline' => $this->configuration['inline'],
     );
   }