rnsrk/boehler_advanced_search
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update pager links after searching in place

Browse source
This commit is contained in:
Kyle Huynh 2022-01-26 19:46:24 +00:00
parent 81342141fc
commit e52f1db462
2 changed files with 58 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

57
js/advanced_search.form.js
View file

@ -81,6 +81,26 @@
return window.location.href.split("?")[0] + "?" + $.param(params); return window.location.href.split("?")[0] + "?" + $.param(params);
} }
$.urlParam = function(url, name){
var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(url);
if (results !== null)
return results[1] || 0;
else {
return null;
}
}
$.updateParam = function(urlstring, param, value) {
var url = new URL(urlstring);
var search_params = url.searchParams;
search_params.set(param, value);
url.search = search_params.toString();
return url.toString();
}
Drupal.behaviors.advanced_search_form = { Drupal.behaviors.advanced_search_form = {
attach: function (context, settings) { attach: function (context, settings) {
if (settings.advanced_search_form.id !== 'undefined') { if (settings.advanced_search_form.id !== 'undefined') {
@ -108,6 +128,38 @@
e.stopPropagation(); e.stopPropagation();
const inputs = $form.serializeArray(); const inputs = $form.serializeArray();
const href = url(inputs, settings.advanced_search_form); const href = url(inputs, settings.advanced_search_form);
/* digitalutsc added*/
$("li.pager__item a.pager__itemsperpage").each(function( index ) {
// update pager links - items per page
var new_link = href;
if (href.includes("items_per_page=") === false) {
console.log("url has items_per_page");
new_link = new_link + '&items_per_page=' + $(this).text();
$( this ).attr("href", new_link);
}
else {
// replace with new param
new_link = updateParam(new_link, "items_per_page", $(this).text());
$( this ).attr("href", new_link);
}
});
$("li.pager__item a.pager__display").each(function( index ) {
// update pager links - display
var new_link = href;
if (href.includes("display=") === false) {
console.log("url has display");
new_link = new_link + '&display=' + $(this).text();
$( this ).attr("href", new_link);
}
else {
// replace with new param
new_link = updateParam(new_link, "display", $(this).text());
$( this ).attr("href", new_link);
}
});
window.history.pushState(null, document.title, href); window.history.pushState(null, document.title, href);
}); });
} }
@ -115,7 +167,10 @@
$form.find('input[data-drupal-selector = "edit-reset"]').mousedown(function (e) { $form.find('input[data-drupal-selector = "edit-reset"]').mousedown(function (e) {
const inputs = []; const inputs = [];
const href = url(inputs, settings.advanced_search_form); const href = url(inputs, settings.advanced_search_form);
window.history.pushState(null, document.title, href); window.history.pushState(null, document.title, href.split('?')[0] );
window.location.replace(href.split('?')[0]);
}); });
} }
} }

4
src/Plugin/Block/SearchResultsPagerBlock.php
View file

@ -185,7 +185,7 @@ class SearchResultsPagerBlock extends BlockBase implements ContainerFactoryPlugi
'#url' => $url, '#url' => $url,
'#title' => $items_per_page, '#title' => $items_per_page,
'#attributes' => [ '#attributes' => [
'class' => $active ? ['pager__link', 'pager__link--is-active'] : ['pager__link'], 'class' => $active ? ['pager__link', 'pager__link--is-active', 'pager__itemsperpage'] : ['pager__link', 'pager__itemsperpage'],
], ],
'#wrapper_attributes' => [ '#wrapper_attributes' => [
'class' => $active ? ['pager__item', 'is-active'] : ['pager__item'], 'class' => $active ? ['pager__item', 'is-active'] : ['pager__item'],
@ -236,7 +236,7 @@ class SearchResultsPagerBlock extends BlockBase implements ContainerFactoryPlugi
'#url' => $url, '#url' => $url,
'#title' => Markup::create($text), '#title' => Markup::create($text),
'#attributes' => [ '#attributes' => [
'class' => $active ? ['pager__link', 'pager__link--is-active'] : ['pager__link'], 'class' => $active ? ['pager__link', 'pager__link--is-active', 'pager__display'] : ['pager__link', 'pager__display'],
], ],
'#wrapper_attributes' => [ '#wrapper_attributes' => [
'class' => $active ? ['pager__item', 'is-active'] : ['pager__item'], 'class' => $active ? ['pager__item', 'is-active'] : ['pager__item'],