From f215ad97d957063e8c6a025d9ce7108ae4a99c93 Mon Sep 17 00:00:00 2001 From: Alexander O'Neill Date: Sat, 15 Jul 2023 21:23:49 -0300 Subject: [PATCH] Issue #26: Fix 'Use local library' option. --- islandora_mirador.module | 1 + src/Form/MiradorConfigForm.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/islandora_mirador.module b/islandora_mirador.module index 5d4621e..298c87a 100644 --- a/islandora_mirador.module +++ b/islandora_mirador.module @@ -94,6 +94,7 @@ function islandora_mirador_library_info_alter(&$libraries, $extension) { if ($config->get('mirador_library_installation_type') == 'local') { unset($libraries['mirador']['remote']); unset($libraries['mirador']['license']); + unset($libraries['mirador']['js']); $libraries['mirador']['js']['/libraries/mirador/dist/main.js'] = []; } } diff --git a/src/Form/MiradorConfigForm.php b/src/Form/MiradorConfigForm.php index 4f086a1..94fdaea 100644 --- a/src/Form/MiradorConfigForm.php +++ b/src/Form/MiradorConfigForm.php @@ -2,16 +2,18 @@ namespace Drupal\islandora_mirador\Form; +use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Config\ConfigFactoryInterface; use Drupal\islandora_mirador\Annotation\IslandoraMiradorPlugin; use Drupal\islandora_mirador\IslandoraMiradorPluginManager; use Symfony\Component\DependencyInjection\ContainerInterface; + /** * Mirador Settings Form. */ class MiradorConfigForm extends ConfigFormBase { + /** * @var \Drupal\islandora_mirador\IslandoraMiradorPluginManager */ @@ -40,6 +42,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 'local'=> $this->t('Local library placed in /libraries inside your webroot.'), 'remote' => $this->t('Default remote location'), ], + '#description' => $this->t("For local, put the output of 'npm run webpack' of Mirador Integration Islandora into web/library/mirador/dist/ and ensure it's named main.js."), '#default_value' => $config->get('mirador_library_installation_type'), ];