';
- html += '
';
+ html += '
';
html += '
';
diff --git a/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js b/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js
index e9dc2c289d..b2aedee634 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/notifications/notifications.js
@@ -40,14 +40,11 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
resetRegistration();
- function show(title, options, timeoutMs) {
+ function showPersistentNotification(title, options, timeoutMs) {
+ serviceWorkerRegistration.showNotification(title, options);
+ }
- resetRegistration();
-
- if (serviceWorkerRegistration && !timeoutMs) {
- serviceWorkerRegistration.showNotification(title, options);
- return;
- }
+ function showNonPersistentNotification(title, options, timeoutMs) {
try {
var notif = new Notification(title, options);
@@ -69,6 +66,18 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
}
}
+ function show(title, options, timeoutMs) {
+
+ resetRegistration();
+
+ if (serviceWorkerRegistration) {
+ showPersistentNotification(title, options, timeoutMs);
+ return;
+ }
+
+ showNonPersistentNotification(title, options, timeoutMs);
+ }
+
function showNewItemNotification(item, apiClient) {
var notification = {
@@ -162,10 +171,10 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
else if (status == 'progress') {
notification.title = globalize.translate('sharedcomponents#InstallingPackage').replace('{0}', installation.Name + ' ' + installation.Version);
- //notification.actions =
- //[
- // { action: 'cancel', title: globalize.translate('sharedcomponents#ButtonCancel')/*, icon: 'https://example/like.png'*/ }
- //];
+ notification.actions =
+ [
+ { action: 'cancel-install-' + installation.Id, title: globalize.translate('sharedcomponents#ButtonCancel')/*, icon: 'https://example/like.png'*/ }
+ ];
}
if (status == 'progress') {
diff --git a/dashboard-ui/bower_components/iron-demo-helpers/.bower.json b/dashboard-ui/bower_components/iron-demo-helpers/.bower.json
index d095b77163..516645ea84 100644
--- a/dashboard-ui/bower_components/iron-demo-helpers/.bower.json
+++ b/dashboard-ui/bower_components/iron-demo-helpers/.bower.json
@@ -1,6 +1,6 @@
{
"name": "iron-demo-helpers",
- "version": "1.2.4",
+ "version": "1.2.5",
"description": "Utility classes to make building demo pages easier",
"authors": [
"The Polymer Authors"
@@ -28,7 +28,7 @@
"paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.0.0",
"marked-element": "polymerelements/marked-element#^1.0.0",
- "prism-element": "PolymerElements/prism-element#^1.0.0",
+ "prism-element": "PolymerElements/prism-element#^1.1.0",
"iron-location": "PolymerElements/iron-location#^0.8.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0"
},
@@ -41,11 +41,11 @@
"paper-styles": "PolymerElements/paper-styles#^1.1.0",
"paper-checkbox": "PolymerElements/paper-checkbox#^1.0.0"
},
- "_release": "1.2.4",
+ "_release": "1.2.5",
"_resolution": {
"type": "version",
- "tag": "v1.2.4",
- "commit": "98e06f4c526146e9e7231138d91f8c65ffb25cd6"
+ "tag": "v1.2.5",
+ "commit": "a376e52de29be389fa22e175b64c9813163023fb"
},
"_source": "git://github.com/polymerelements/iron-demo-helpers.git",
"_target": "^1.0.0",
diff --git a/dashboard-ui/bower_components/iron-demo-helpers/bower.json b/dashboard-ui/bower_components/iron-demo-helpers/bower.json
index f17608bd5d..6016cdfcff 100644
--- a/dashboard-ui/bower_components/iron-demo-helpers/bower.json
+++ b/dashboard-ui/bower_components/iron-demo-helpers/bower.json
@@ -1,6 +1,6 @@
{
"name": "iron-demo-helpers",
- "version": "1.2.4",
+ "version": "1.2.5",
"description": "Utility classes to make building demo pages easier",
"authors": [
"The Polymer Authors"
@@ -28,7 +28,7 @@
"paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
"paper-styles": "PolymerElements/paper-styles#^1.0.0",
"marked-element": "polymerelements/marked-element#^1.0.0",
- "prism-element": "PolymerElements/prism-element#^1.0.0",
+ "prism-element": "PolymerElements/prism-element#^1.1.0",
"iron-location": "PolymerElements/iron-location#^0.8.0",
"iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0"
},
diff --git a/dashboard-ui/bower_components/iron-demo-helpers/demo-snippet.html b/dashboard-ui/bower_components/iron-demo-helpers/demo-snippet.html
index a209a69484..b0317f4ce0 100644
--- a/dashboard-ui/bower_components/iron-demo-helpers/demo-snippet.html
+++ b/dashboard-ui/bower_components/iron-demo-helpers/demo-snippet.html
@@ -15,6 +15,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
+