Merge pull request #1 from beatrycze-volk/update

Update grunt build
slub · Mar 23, 2021 · 8261409 · 8261409
2 parents eaa0d15 + 56a50eb
commit 8261409
Show file tree

Hide file tree

Showing 5 changed files with 1,256 additions and 16 deletions.
diff --git a/Build/Gruntfile.js b/Build/Gruntfile.js
@@ -23,10 +23,12 @@ module.exports = function(grunt) {
                 },
                 files: {
                     "Resources/Public/JavaScript/ddbKitodoZeitungsportal.js" : [
-                        'Resources/Public/Javascript/OpenLayers/glif.min.js',
-                        'Resources/Public/Javascript/OpenLayers/ol3-dlf.js',
+                        '../dlf/Resources/Public/Javascript/jQueryUI/jquery-ui-mouse-slider-resizable-autocomplete.js',
+                        '../dlf/Resources/Public/Javascript/OpenLayers/glif.min.js',
+                        '../dlf/Resources/Public/Javascript/OpenLayers/ol3-dlf.js',
                         // Viewer
-                        '../dlf/Resources/Public/Javascript/PageView/Utility.js',
+                        // highlight exact word in search results
+                        'Resources/Private/JavaScript/Kitodo/PageView/Utility.js',
                         '../dlf/Resources/Public/Javascript/PageView/OL3.js',
                         '../dlf/Resources/Public/Javascript/PageView/OL3Styles.js',
                         '../dlf/Resources/Public/Javascript/PageView/OL3Sources.js',
@@ -35,9 +37,14 @@ module.exports = function(grunt) {
                         '../dlf/Resources/Public/Javascript/PageView/AnnotationControl.js',
                         '../dlf/Resources/Public/Javascript/PageView/ImageManipulationControl.js',
                         '../dlf/Resources/Public/Javascript/PageView/FulltextDownloadControl.js',
+                        // custom scrolling
                         'Resources/Private/JavaScript/Kitodo/PageView/FulltextControl.js',
                         '../dlf/Resources/Public/Javascript/PageView/FullTextUtility.js',
-                        '../dlf/Resources/Public/Javascript/PageView/PageView.js'
+                        '../dlf/Resources/Public/Javascript/PageView/PageView.js',
+                        // Search
+                        // use standard input instead of submit button
+                        // TODO: add template
+                        'Resources/Private/JavaScript/Kitodo/Search/SearchInDocument.js'
                     ],
                 }
             }

diff --git a/Resources/Private/JavaScript/Kitodo/PageView/FulltextControl.js b/Resources/Private/JavaScript/Kitodo/PageView/FulltextControl.js
@@ -57,7 +57,13 @@ var dlfViewerFullTextControl = function(map, image, fulltextUrl) {
      */
     this.dic = $('#tx-dlf-tools-fulltext').length > 0 && $('#tx-dlf-tools-fulltext').attr('data-dic') ?
         dlfUtils.parseDataDic($('#tx-dlf-tools-fulltext')) :
-        {'fulltext':'Fulltext', 'fulltext-on':'Activate Fulltext','fulltext-off':'Deactivate Fulltext', 'activate-full-text-initially':'0', 'full-text-scroll-element':'html, body'};
+        {
+            'fulltext':'Fulltext',
+            'fulltext-on':'Activate Fulltext',
+            'fulltext-off':'Deactivate Fulltext',
+            'activate-full-text-initially':'0',
+            'full-text-scroll-element':'html, body',
+            'search-hl-parameters':'tx_dlf[highlight_word]'};
 
     /**
      * @type {number}
@@ -71,6 +77,12 @@ var dlfViewerFullTextControl = function(map, image, fulltextUrl) {
      */
     this.fullTextScrollElement = this.dic['full-text-scroll-element'];
 
+    /**
+     * @type {string}
+     * @private
+     */
+    this.searchHlParameters = this.dic['search-hl-parameters'];
+
     /**
      * @type {ol.Feature|undefined}
      * @private