Skip to content

auto-dismiss #128

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
merged 4 commits into from
Oct 3, 2019
Merged

auto-dismiss #128

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92ea011
auto-dismiss
brianteeman Sep 16, 2019
a4f6f5b
put back role
brianteeman Sep 17, 2019
670f8e7
Merge branch 'master' into patch-1
brianteeman Sep 17, 2019
2a882ab
codestyle
brianteeman Sep 18, 2019
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
41 changes: 28 additions & 13 deletions src/js/alert/alert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

get dismiss() { return this.getAttribute('dismiss'); }

get autodismiss() { return this.getAttribute('auto-dismiss'); }

get acknowledge() { return this.getAttribute('acknowledge'); }

get href() { return this.getAttribute('href'); }
Expand All @@ -35,6 +37,10 @@
this.appendCloseButton();
}

if (this.hasAttribute('auto-dismiss')) {
this.autoDismiss();
}

this.dispatchCustomEvent('joomla.alert.show');
}

Expand Down Expand Up @@ -70,6 +76,9 @@
this.removeCloseButton();
}
break;
case 'auto-dismiss':
this.autoDismiss();
break;
case 'href':
if (!newValue || newValue === '') {
this.removeCloseButton();
Expand All @@ -83,11 +92,15 @@
}

/* Method to close the alert */
close() {
close(element = null) {
this.dispatchCustomEvent('joomla.alert.close');
this.addEventListener('transitionend', () => {
this.dispatchCustomEvent('joomla.alert.closed');
this.parentNode.removeChild(this);
if (element) {
element.remove();
} else {
this.remove();
}
}, false);
this.classList.remove('joomla-alert--show');
}
Expand Down Expand Up @@ -148,25 +161,27 @@
});
}
}
}

if (this.hasAttribute('auto-dismiss')) {
setTimeout(() => {
self.dispatchCustomEvent('joomla.alert.buttonClicked');
if (self.hasAttribute('data-callback')) {
window[self.getAttribute('data-callback')]();
} else {
self.close();
}
}, self.getAttribute('auto-dismiss') ? parseInt(self.getAttribute('auto-dismiss'), 10) : 3000);
}
/* Method to auto-dismiss */
autoDismiss() {
const self = this;
setTimeout(() => {
self.dispatchCustomEvent('joomla.alert.buttonClicked');
if (self.hasAttribute('data-callback')) {
window[self.getAttribute('data-callback')]();
} else {
self.close(self);
}
}, parseInt(self.getAttribute('auto-dismiss'), 10) ? self.getAttribute('auto-dismiss') : 3000);
}

/* Method to remove the close button */
removeCloseButton() {
const button = this.querySelector('button');
if (button) {
button.removeEventListener('click', this);
button.parentNode.removeChild(button);
button.remove();
}
}

Expand Down