Merge branch 'feature/ISTWCMS-4501-ebremner-ckeditor-libraries' into '8.x-1.x'

Feature/istwcms 4501 ebremner ckeditor libraries

See merge request !53

src/Plugin/CKEditorPlugin/ClipboardPlugin.php

@@ -3,7 +3,10 @@
 namespace Drupal\uw_cfg_common\Plugin\CKEditorPlugin;
 
 use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the "clipboard" plugin.
@@ -13,7 +16,38 @@ use Drupal\editor\Entity\Editor;
  *   label = @Translation("Clipboard")
  * )
  */
-class ClipboardPlugin extends CKEditorPluginBase {
+class ClipboardPlugin extends CKEditorPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Library file finder.
+   *
+   * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+   */
+  protected $libFileFinder;
+
+  /**
+   * Constructs a BlockComponentRenderArray object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Asset\LibrariesDirectoryFileFinder $libFileFinder
+   *   The library file finder.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, LibrariesDirectoryFileFinder $libFileFinder) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->libFileFinder = $libFileFinder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('library.libraries_directory_file_finder'));
+  }
 
   /**
    * {@inheritdoc}
@@ -33,7 +67,7 @@ class ClipboardPlugin extends CKEditorPluginBase {
    * {@inheritdoc}
    */
   public function getFile() {
-    return drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-clipboard/plugin.js';
+    return $this->libFileFinder->find('ckeditor-clipboard') . '/plugin.js';
   }
 
 }

src/Plugin/CKEditorPlugin/DialogPlugin.php

@@ -3,7 +3,10 @@
 namespace Drupal\uw_cfg_common\Plugin\CKEditorPlugin;
 
 use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the "dialog" plugin.
@@ -13,7 +16,38 @@ use Drupal\editor\Entity\Editor;
  *   label = @Translation("Dialog")
  * )
  */
-class DialogPlugin extends CKEditorPluginBase {
+class DialogPlugin extends CKEditorPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Library file finder.
+   *
+   * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+   */
+  protected $libFileFinder;
+
+  /**
+   * Constructs a BlockComponentRenderArray object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Asset\LibrariesDirectoryFileFinder $libFileFinder
+   *   The library file finder.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, LibrariesDirectoryFileFinder $libFileFinder) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->libFileFinder = $libFileFinder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('library.libraries_directory_file_finder'));
+  }
 
   /**
    * {@inheritdoc}
@@ -33,7 +67,7 @@ class DialogPlugin extends CKEditorPluginBase {
    * {@inheritdoc}
    */
   public function getFile() {
-    return drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-dialog/plugin.js';
+    return $this->libFileFinder->find('ckeditor-dialog') . '/plugin.js';
   }
 
 }

src/Plugin/CKEditorPlugin/LineutilsPlugin.php

@@ -3,7 +3,10 @@
 namespace Drupal\uw_cfg_common\Plugin\CKEditorPlugin;
 
 use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the "lineutils" plugin.
@@ -13,7 +16,38 @@ use Drupal\editor\Entity\Editor;
  *   label = @Translation("Line Utilities")
  * )
  */
-class LineutilsPlugin extends CKEditorPluginBase {
+class LineutilsPlugin extends CKEditorPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Library file finder.
+   *
+   * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+   */
+  protected $libFileFinder;
+
+  /**
+   * Constructs a BlockComponentRenderArray object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Asset\LibrariesDirectoryFileFinder $libFileFinder
+   *   The library file finder.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, LibrariesDirectoryFileFinder $libFileFinder) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->libFileFinder = $libFileFinder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('library.libraries_directory_file_finder'));
+  }
 
   /**
    * {@inheritdoc}
@@ -33,7 +67,7 @@ class LineutilsPlugin extends CKEditorPluginBase {
    * {@inheritdoc}
    */
   public function getFile() {
-    return drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-lineutils/plugin.js';
+    return $this->libFileFinder->find('ckeditor-lineutils') . '/plugin.js';
   }
 
 }

src/Plugin/CKEditorPlugin/WidgetPlugin.php

@@ -3,7 +3,10 @@
 namespace Drupal\uw_cfg_common\Plugin\CKEditorPlugin;
 
 use Drupal\ckeditor\CKEditorPluginBase;
+use Drupal\Core\Asset\LibrariesDirectoryFileFinder;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * Defines the "widget" plugin.
@@ -13,7 +16,38 @@ use Drupal\editor\Entity\Editor;
  *   label = @Translation("Widget")
  * )
  */
-class WidgetPlugin extends CKEditorPluginBase {
+class WidgetPlugin extends CKEditorPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * Library file finder.
+   *
+   * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder
+   */
+  protected $libFileFinder;
+
+  /**
+   * Constructs a BlockComponentRenderArray object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin ID for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Asset\LibrariesDirectoryFileFinder $libFileFinder
+   *   The library file finder.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, LibrariesDirectoryFileFinder $libFileFinder) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->libFileFinder = $libFileFinder;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static($configuration, $plugin_id, $plugin_definition, $container->get('library.libraries_directory_file_finder'));
+  }
 
   /**
    * {@inheritdoc}
@@ -33,7 +67,7 @@ class WidgetPlugin extends CKEditorPluginBase {
    * {@inheritdoc}
    */
   public function getFile() {
-    return drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-widget/plugin.js';
+    return $this->libFileFinder->find('ckeditor-widget') . '/plugin.js';
   }
 
 }