From 7c9597a3021fd50b774200f7d2800bdf0755bead Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle <patrizio.bekerle@tugraz.at> Date: Wed, 7 Aug 2019 11:03:30 +0200 Subject: [PATCH] Implement alert fallback --- packages/notification/src/index.js | 2 +- packages/notification/src/notification.js | 25 ------------------- .../notification/src/vpu-notification-demo.js | 2 +- packages/notification/src/vpu-notification.js | 3 +++ packages/notification/vendor/common | 2 +- 5 files changed, 6 insertions(+), 28 deletions(-) delete mode 100644 packages/notification/src/notification.js diff --git a/packages/notification/src/index.js b/packages/notification/src/index.js index d1562574..bcee6d68 100644 --- a/packages/notification/src/index.js +++ b/packages/notification/src/index.js @@ -1,4 +1,4 @@ import './vpu-notification'; -import { send } from './notification'; +import { send } from 'vpu-common/notification'; export { send }; diff --git a/packages/notification/src/notification.js b/packages/notification/src/notification.js deleted file mode 100644 index ac18c030..00000000 --- a/packages/notification/src/notification.js +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Sends a notification via the event - * - * example options: - * - * { - * "summary": "Item deleted", - * "body": "Item foo was deleted!", - * "type": "info", - * "timeout": 5, - * } - * - * @param options - */ -function send(options) { - const event = new CustomEvent("vpu-notification-send", { - bubbles: true, - cancelable: true, - detail: options, - }); - - window.dispatchEvent(event); -} - -export { send }; diff --git a/packages/notification/src/vpu-notification-demo.js b/packages/notification/src/vpu-notification-demo.js index 31c4c0d3..113b63ed 100644 --- a/packages/notification/src/vpu-notification-demo.js +++ b/packages/notification/src/vpu-notification-demo.js @@ -1,5 +1,5 @@ import {i18n} from './i18n'; -import {send as notify} from './notification'; +import {send as notify} from 'vpu-common/notification'; import {html, LitElement} from 'lit-element'; import './vpu-notification'; import commonUtils from 'vpu-common/utils'; diff --git a/packages/notification/src/vpu-notification.js b/packages/notification/src/vpu-notification.js index e95fe4c9..14db6245 100644 --- a/packages/notification/src/vpu-notification.js +++ b/packages/notification/src/vpu-notification.js @@ -56,6 +56,9 @@ class VPUNotification extends VPULitElement { that.removeMessageId(messageId); }, timeout * 1000); } + + // mark the event as handled + e.preventDefault(); }); this.updateComplete.then(()=>{ diff --git a/packages/notification/vendor/common b/packages/notification/vendor/common index 68e0a4f1..3623e0d1 160000 --- a/packages/notification/vendor/common +++ b/packages/notification/vendor/common @@ -1 +1 @@ -Subproject commit 68e0a4f1f1a3ef6e05aca5216bf8684578ec2229 +Subproject commit 3623e0d1d062c1048ee37ac779d9425b56ffe26b -- GitLab