Merge branch 'master' into prepare-release-3.2.0

Classes/Plugin/PageView.php

@@ -97,6 +97,7 @@ protected function addViewerJS()
             '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.

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 <[email protected]>
  * @author Alexander Bigga <[email protected]>
+ * @author Beatrycze Volk <[email protected]>
  * @package TYPO3
  * @subpackage dlf
  * @access public
@@ -52,8 +50,6 @@ public function main($content, $conf)
             $this->conf = Helper::mergeRecursiveWithOverrule($this->cObj->data['conf'], $this->conf);
         }
 
-        $this->addSearchInDocumentJS();
-
         // Load current document.
         $this->loadDocument();
         if (
@@ -125,19 +121,6 @@ public function main($content, $conf)
         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
      *