Skip to content

[6.0] Replace dialog GIF loader with Custom Element #44232

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

Closed
C-Lodder wants to merge 3 commits into from
Closed

[6.0] Replace dialog GIF loader with Custom Element #44232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d29db
Replace dialog GIF loader with SVG
C-Lodder Oct 11, 2024
2946e8f
Merge branch '5.3-dev' into loader-icon
C-Lodder Oct 15, 2024
4b6277c
eslint fixes
C-Lodder Oct 15, 2024
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
3 changes: 2 additions & 1 deletion build/media_source/system/joomla.asset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,8 @@
"importmap": true,
"dependencies": [
"wcpolyfill",
"core"
"core",
"webcomponent.core-loader"
]
},
{
Expand Down
25 changes: 21 additions & 4 deletions build/media_source/system/js/joomla-dialog.w-c.es6.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,20 @@ class JoomlaDialog extends HTMLElement {
return this;
}

/**
* Internal. Create a loader element. This is only used for AJAX and Iframe content
* @returns {HTMLElement}
*/
static renderLoader() {
const loader = document.createElement('joomla-core-loader');
loader.setAttribute('inline', true);
loader.setAttribute('size', 60);
loader.setAttribute('color', 'transparent');
loader.classList.add('mt-5');

return loader;
}

/**
* Internal. Render the body content, based on popupType.
* @returns {JoomlaDialog}
Expand All @@ -321,8 +335,7 @@ class JoomlaDialog extends HTMLElement {

// Callback for loaded content event listener
const onLoad = () => {
this.classList.add('loaded');
this.classList.remove('loading');
this.popupTmplB.removeChild(this.querySelector('joomla-core-loader'));
this.popupContentElement.removeEventListener('load', onLoad);
this.dispatchEvent(new CustomEvent('joomla-dialog:load'));

Expand All @@ -335,8 +348,6 @@ class JoomlaDialog extends HTMLElement {
}
};

this.classList.add('loading');

switch (this.popupType) {
// Create an Inline content
case 'inline': {
Expand Down Expand Up @@ -371,6 +382,9 @@ class JoomlaDialog extends HTMLElement {

// Create an IFrame content
case 'iframe': {
// Append the loader
this.popupTmplB.appendChild(this.constructor.renderLoader());

const frame = document.createElement('iframe');
frame.addEventListener('load', onLoad);
frame.src = this.src;
Expand Down Expand Up @@ -399,6 +413,9 @@ class JoomlaDialog extends HTMLElement {

// Create an AJAX content
case 'ajax': {
// Append the loader
this.popupTmplB.appendChild(this.constructor.renderLoader());

fetch(this.src)
.then((response) => {
if (response.status !== 200) {
Expand Down
27 changes: 0 additions & 27 deletions build/media_source/templates/site/cassiopeia/scss/blocks/_modals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,24 +72,6 @@ joomla-dialog {
width: 100%;
height: 100%;
}

// Extra loading animation for iframe and ajax types
&[type="iframe"],
&[type="ajax"] {
&.loading {
dialog:after {
position: absolute;
top: 50%;
left: 50%;
display: block;
width: 66px;
height: 66px;
content: "";
background: url("../../../../system/images/ajax-loader.gif") no-repeat center;
transform: translate(-50%, -50%);
}
}
}
}
// Dialog animation
joomla-dialog dialog[open] {
Expand Down Expand Up @@ -167,15 +149,6 @@ joomla-dialog dialog[open] {
joomla-dialog[type="ajax"] & {
overflow: auto;
}

// Content basic loading animation
joomla-dialog.loading & {
opacity: 0;
}
joomla-dialog.loaded & {
opacity: 1;
transition: opacity .4s ease;
}
}
.joomla-dialog-footer {
position: relative;
Expand Down