Skip to content

Commit

Permalink
Removed initOnAjaxLoad and allow initOnAjaxUrls to be a string
Browse files Browse the repository at this point in the history
  • Loading branch information
marc-farre committed Sep 14, 2023
1 parent 080f487 commit df26f8b
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions static/js/humhub/humhub.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,12 @@ var humhub = humhub || (function ($) {
pjaxInitModules.push(instance);
}

if (instance.initOnAjaxLoad && instance.config.initOnAjaxUrls) {
initOnAjaxUrls = instance.config.initOnAjaxUrls;
// Allow single URL as string
if (typeof initOnAjaxUrls === "string") {
initOnAjaxUrls = [initOnAjaxUrls];
}
if (typeof initOnAjaxUrls === 'object') {
$(document).on('ajaxComplete', function (event, jqXHR, ajaxOptions) {
if (ajaxOptions && ajaxOptions.url) {
var ajaxUrl = new URL('https://domain.tld' + ajaxOptions.url);
Expand All @@ -150,7 +155,7 @@ var humhub = humhub || (function ($) {
ajaxUrl.searchParams.delete(name);
}
});
if (instance.config.initOnAjaxUrls.includes(ajaxUrl.pathname + ajaxUrl.search)) {
if (initOnAjaxUrls.includes(ajaxUrl.pathname + ajaxUrl.search)) {
initModule(instance);
}
}
Expand All @@ -170,7 +175,6 @@ var humhub = humhub || (function ($) {
var createModule = function (id, instance) {
instance.require = require;
instance.initOnPjaxLoad = false;
instance.initOnAjaxLoad = false;
instance.isModule = true;
instance.id = 'humhub.modules.' + _cutModulePrefix(id);
instance.config = require('config').module(instance);
Expand Down

0 comments on commit df26f8b

Please sign in to comment.