Skip to content

[3.0] Popup setBody function #9002

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

Merged
live627 merged 2 commits into from
Oct 29, 2025
Merged

[3.0] Popup setBody function #9002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a5d540
Popup setBody function
jdarwood007 Oct 26, 2025
715b810
Update Themes/default/scripts/script.js
jdarwood007 Oct 29, 2025
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 Themes/default/scripts/script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,6 @@ function reqOverlayDiv(desktopURL, sHeader, sIcon)

// Create the div that we are going to load
const oContainer = new smc_Popup(containerOptions);
const oPopup_body = oContainer.cover.querySelector('.popup_content');

// Load the help page content (we just want the text to show)
fetch(desktopURL + (desktopURL.includes('?') ? ';' : '?') + 'ajax', {
Expand All @@ -276,11 +275,14 @@ function reqOverlayDiv(desktopURL, sHeader, sIcon)
})
.then((res, rej) => res.ok ? res.text() : rej(res))
.then(data => {
oPopup_body.innerHTML = data;
const parser = new DOMParser();
const doc = parser.parseFromString(data, "text/html");
const body = doc?.querySelector('body div')?.innerHTML ?? data;
oContainer.setBody(body);
})
.catch(error => {
const errorMsg = error.headers.get('x-smf-errormsg');
oPopup_body.innerHTML = errorMsg || error.message || banned_text;
const errorMsg = error?.headers?.get('x-smf-errormsg') ?? error;
oContainer.setBody(errorMsg || error.message || banned_text);
});

return false;
Expand Down Expand Up @@ -419,6 +421,11 @@ smc_Popup.prototype.hide = function ()
return false;
}

smc_Popup.prototype.setBody = function(data)
{
document.getElementById(this.popup_id).querySelector('.popup_content').innerHTML = data;
}

// Remember the current position.
function storeCaret(oTextHandle)
{
Expand Down