Skip to content

4.x: show debug_kit iframe error nicely #898

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
markstory merged 1 commit into from
Nov 13, 2022
Merged

4.x: show debug_kit iframe error nicely #898

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
4 changes: 4 additions & 0 deletions webroot/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,10 @@ strong {
display: block;
}

.c-panel-content-container__content {
height: 100%;
}

.c-panel-content-container__content .o-loader {
display: none;
}
Expand Down
5 changes: 5 additions & 0 deletions webroot/js/inject-iframe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ if (elem) {
iframe.height = '100%';
doc.body.style.overflow = 'hidden';
}
if (event.data === 'error') {
iframe.width = '40%';
iframe.height = '40%';
doc.body.style.overflow = bodyOverflow;
}
};

const onReady = () => {
Expand Down
9 changes: 8 additions & 1 deletion webroot/js/modules/Toolbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,14 @@ export default class Toolbar {
// This initializes the panel specific JS logic (if there is any)
document.dispatchEvent(new CustomEvent('initPanel', { detail: `panel${panelType}` }));
that.bindDebugBlock();
});
})
.fail((response) => {
clearTimeout(timer);
contentArea.html(response.responseText);
$('.o-loader').removeClass('is-loading');
$('.c-panel-content-container').addClass('is-active');
window.parent.postMessage('error', window.location.origin);
});
}

// This re-inits the collapsible Debugger::exportVar() content of the Variables tab
Expand Down