diff --git a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml b/config/install/layout_builder_browser.layout_builder_browser_block.uw_lbb_twitter.yml similarity index 72% rename from config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml rename to config/install/layout_builder_browser.layout_builder_browser_block.uw_lbb_twitter.yml index c2659882ef84a6233fe07f394a4dadbe27c6352c..2bac90d7f3e1bb80a6d77c06fbbc6f5ff259157c 100644 --- a/config/install/layout_builder_browser.layout_builder_browser_block.inline_blockuw_cbl_twitter.yml +++ b/config/install/layout_builder_browser.layout_builder_browser_block.uw_lbb_twitter.yml @@ -1,10 +1,10 @@ langcode: en status: true dependencies: { } -id: inline_blockuw_cbl_twitter -block_id: 'inline_block:uw_cbl_twitter' +id: uw_lbb_twitter +block_id: uw_cbl_twitter category: uw_bc_external_embeds label: Twitter -weight: 0 +weight: -4 image_path: /profiles/uw_base_profile/themes/uw_fdsu_theme_resp/images/layout_builder_browser/twitter.svg image_alt: '' diff --git a/src/Plugin/CKEditorPlugin/MathJaxPlugin.php b/src/Plugin/CKEditorPlugin/MathJaxPlugin.php index bdfd952bf2a7a0e20513a9713e9386db62b1d140..03a61afae6af60733f42465e352894285ebb00f5 100644 --- a/src/Plugin/CKEditorPlugin/MathJaxPlugin.php +++ b/src/Plugin/CKEditorPlugin/MathJaxPlugin.php @@ -3,7 +3,11 @@ namespace Drupal\uw_cfg_common\Plugin\CKEditorPlugin; use Drupal\ckeditor\CKEditorPluginBase; +use Drupal\Core\File\FileSystem; +use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\editor\Entity\Editor; +use Drupal\Core\Asset\LibrariesDirectoryFileFinder; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Defines the "mathjax" plugin. @@ -13,7 +17,48 @@ use Drupal\editor\Entity\Editor; * label = @Translation("Mathjax") * ) */ -class MathJaxPlugin extends CKEditorPluginBase { +class MathJaxPlugin extends CKEditorPluginBase implements ContainerFactoryPluginInterface { + + /** + * Library file finder. + * + * @var \Drupal\Core\Asset\LibrariesDirectoryFileFinder + */ + protected $libFileFinder; + + /** + * File system. + * + * @var \Drupal\Core\File\FileSystem + */ + protected $fileSystem; + + /** + * 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. + * @param \Drupal\Core\File\FileSystem $fileSystem + * The file system. + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, LibrariesDirectoryFileFinder $libFileFinder, FileSystem $fileSystem) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + $this->libFileFinder = $libFileFinder; + $this->fileSystem = $fileSystem; + } + + /** + * {@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'), $container->get('file_system')); + } /** * {@inheritdoc} @@ -50,7 +95,7 @@ class MathJaxPlugin extends CKEditorPluginBase { return [ 'Mathjax' => [ 'label' => $this->t('Math'), - 'image' => drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-mathjax/icons/mathjax.png', + 'image' => $this->fileSystem->realpath($this->libFileFinder->find('ckeditor-mathjax')) . '/icons/mathjax.png', ], ]; } @@ -59,7 +104,7 @@ class MathJaxPlugin extends CKEditorPluginBase { * {@inheritdoc} */ public function getFile() { - return drupal_get_path('profile', 'uw_base_profile') . '/libraries/ckeditor-mathjax/plugin.js'; + return $this->fileSystem->realpath($this->libFileFinder->find('ckeditor-mathjax')) . '/plugin.js'; } }