Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update grunt build #1

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Update grunt build #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions Build/Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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'
],
}
}
Expand Down
14 changes: 13 additions & 1 deletion Resources/Private/JavaScript/Kitodo/PageView/FulltextControl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand Down
Loading