diff --git a/Classes/Plugin/PageView.php b/Classes/Plugin/PageView.php index becc88b3..4006c435 100644 --- a/Classes/Plugin/PageView.php +++ b/Classes/Plugin/PageView.php @@ -97,6 +97,7 @@ class PageView extends \Kitodo\Dlf\Common\AbstractPlugin 'Resources/Public/Javascript/PageView/FulltextDownloadControl.js', 'Resources/Public/Javascript/PageView/FulltextControl.js', 'Resources/Public/Javascript/PageView/FullTextUtility.js', + 'Resources/Public/Javascript/PageView/SearchInDocument.js', 'Resources/Public/Javascript/PageView/PageView.js' ]; // Viewer configuration. diff --git a/Classes/Plugin/Tools/SearchInDocumentTool.php b/Classes/Plugin/Tools/SearchInDocumentTool.php index 5afa6cd7..cfead9e4 100644 --- a/Classes/Plugin/Tools/SearchInDocumentTool.php +++ b/Classes/Plugin/Tools/SearchInDocumentTool.php @@ -13,17 +13,15 @@ namespace Kitodo\Dlf\Plugin\Tools; use Kitodo\Dlf\Common\Helper; -use TYPO3\CMS\Core\Page\PageRenderer; -use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\MathUtility; -use TYPO3\CMS\Core\Utility\PathUtility; /** * SearchInDocument tool for the plugin 'Toolbox' of the 'dlf' extension * * @author Sebastian Meyer * @author Alexander Bigga + * @author Beatrycze Volk * @package TYPO3 * @subpackage dlf * @access public @@ -52,8 +50,6 @@ class SearchInDocumentTool extends \Kitodo\Dlf\Common\AbstractPlugin $this->conf = Helper::mergeRecursiveWithOverrule($this->cObj->data['conf'], $this->conf); } - $this->addSearchInDocumentJS(); - // Load current document. $this->loadDocument(); if ( @@ -125,19 +121,6 @@ class SearchInDocumentTool extends \Kitodo\Dlf\Common\AbstractPlugin return $this->pi_wrapInBaseClass($content); } - /** - * Adds the JS files necessary for search in document - * - * @access protected - * - * @return void - */ - protected function addSearchInDocumentJS() - { - $pageRenderer = GeneralUtility::makeInstance(PageRenderer::class); - $pageRenderer->addJsFooterFile(PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/Search/SearchInDocument.js'); - } - /** * Get the encrypted Solr core name * diff --git a/Resources/Public/Javascript/Search/SearchInDocument.js b/Resources/Public/Javascript/PageView/SearchInDocument.js similarity index 100% rename from Resources/Public/Javascript/Search/SearchInDocument.js rename to Resources/Public/Javascript/PageView/SearchInDocument.js