Skip to content
New issue

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

#

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

Already on GitHub? # to your account

add MutationObserver for Blacklight 8 Modal #249

Merged
merged 1 commit into from
Dec 4, 2023
Merged

add MutationObserver for Blacklight 8 Modal #249

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
10 changes: 5 additions & 5 deletions app/assets/javascripts/blacklight_range_limit/range_limit_distro_facets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,8 @@ Blacklight.onLoad(function() {
}
});

// Support for Blacklight 7 and 8:
const modalSelector = Blacklight.modal?.modalSelector || Blacklight.Modal.modalSelector

// When loaded in a modal
$(modalSelector).on('shown.bs.modal', function() {
// For Blacklight version < 8, when loaded in a modal
$(BlacklightRangeLimit.modalSelector).on('shown.bs.modal', function() {
$(this).find(".range_limit .profile .distribution.chart_js ul").each(function() {
BlacklightRangeLimit.turnIntoPlot($(this).parent());
});
Expand All @@ -44,6 +41,9 @@ Blacklight.onLoad(function() {
BlacklightRangeLimit.checkForNeededFacetsToFetch();
});

// Use a mutation observer to detect when the HTML dialog is open
BlacklightRangeLimit.initPlotModalObserver();

$("body").on("shown.bs.collapse", function(event) {
var container = $(event.target).filter(".facet-content").find(".chart_js");
BlacklightRangeLimit.redrawPlot(container);
Expand Down
42 changes: 41 additions & 1 deletion app/assets/javascripts/blacklight_range_limit/range_limit_shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,44 @@ BlacklightRangeLimit.normalized_selection = function normalized_selection(min, m
// Check if Flot is loaded
BlacklightRangeLimit.domDependenciesMet = function domDependenciesMet() {
return typeof $.plot != "undefined"
}
}

// Support for Blacklight 7 and 8:
BlacklightRangeLimit.modalSelector = Blacklight.modal?.modalSelector || Blacklight.Modal.modalSelector

BlacklightRangeLimit.modalObserverConfig = {
attributes: true,
}

BlacklightRangeLimit.initSliderModalObserver = function() {
// Use a mutation observer to detect when the modal dialog is open
const modalObserver = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
if (mutation.attributeName !== 'open') {return;}
if (mutation.target.hasAttribute('open')) {
$(BlacklightRangeLimit.modalSelector).find(".range_limit .profile .range.slider_js").each(function() {
BlacklightRangeLimit.buildSlider(this);
});
}
});
});
modalObserver.observe($(BlacklightRangeLimit.modalSelector)[0], BlacklightRangeLimit.modalObserverConfig);
}

BlacklightRangeLimit.initPlotModalObserver = function() {
// Use a mutation observer to detect when the modal dialog is open
const modalObserver = new MutationObserver(function(mutations) {
mutations.forEach(function(mutation) {
if (mutation.attributeName !== 'open') {return;}
if (mutation.target.hasAttribute('open')) {
$(BlacklightRangeLimit.modalSelector).find(".range_limit .profile .distribution.chart_js ul").each(function() {
BlacklightRangeLimit.turnIntoPlot($(this).parent());
});

// Case when there is no currently selected range
BlacklightRangeLimit.checkForNeededFacetsToFetch();
}
});
});
modalObserver.observe($(BlacklightRangeLimit.modalSelector)[0], BlacklightRangeLimit.modalObserverConfig);
}
9 changes: 5 additions & 4 deletions app/assets/javascripts/blacklight_range_limit/range_limit_slider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ Blacklight.onLoad(function() {
BlacklightRangeLimit.buildSlider(this);
});

// Support for Blacklight 7 and 8:
const modalSelector = Blacklight.modal?.modalSelector || Blacklight.Modal.modalSelector

$(modalSelector).on('shown.bs.modal', function() {
// For Blacklight < 8, when loaded in a modal
$(BlacklightRangeLimit.modalSelector).on('shown.bs.modal', function() {
$(this).find(".range_limit .profile .range.slider_js").each(function() {
BlacklightRangeLimit.buildSlider(this);
});
});

// For Blacklight 8, use a mutation observer to detect when the HTML dialog is open
BlacklightRangeLimit.initSliderModalObserver();

// catch event for redrawing chart, to redraw slider to match width
$("body").on("plotDrawn.blacklight.rangeLimit", function(event) {
var area = $(event.target).closest(".limit_content.range_limit");
Expand Down