diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c8173849f3..80d2843395 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.2.8", - "_release": "1.2.8", + "version": "1.2.9", + "_release": "1.2.9", "_resolution": { "type": "version", - "tag": "1.2.8", - "commit": "ab69b1f6c75888a55b4baa100f2d3c527633bf49" + "tag": "1.2.9", + "commit": "987b1f5f79a5d31f5c2a94077f7cf0cdd94eaac4" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js index 4842b5a8b5..dd0c56759b 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js +++ b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js @@ -44,7 +44,9 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h html += ''; } - if (options.text) { + var text = options.html || options.text; + + if (text) { if (options.title) { html += '

'; @@ -52,7 +54,7 @@ define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.h html += '

'; } - html += options.text; + html += text; html += '

'; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js index 8e85d2f6d0..47a06ebba7 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js +++ b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js @@ -66,8 +66,10 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) { html += '

' + options.title + '

'; } - if (options.text) { - html += '
' + options.text + '
'; + var text = options.html || options.text; + + if (text) { + html += '
' + text + '
'; } html += '
'; diff --git a/dashboard-ui/bower_components/emby-webcomponents/router.js b/dashboard-ui/bower_components/emby-webcomponents/router.js index fa392549c0..cd95b32e0e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/router.js +++ b/dashboard-ui/bower_components/emby-webcomponents/router.js @@ -69,7 +69,12 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b case MediaBrowser.ConnectionState.ServerUpdateNeeded: { require(['alert'], function (alert) { - alert(Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media')).then(function () { + alert({ + + text: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media'), + html: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media') + + }).then(function () { embyRouter.showSelectServer(); }); }); diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json index f0167baf13..9784e3a3b7 100644 --- a/dashboard-ui/bower_components/iron-icon/.bower.json +++ b/dashboard-ui/bower_components/iron-icon/.bower.json @@ -32,14 +32,14 @@ "web-component-tester": "^4.0.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-icon", + "homepage": "https://github.com/PolymerElements/iron-icon", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "f36b38928849ef3853db727faa8c9ef104d611eb" }, - "_source": "git://github.com/polymerelements/iron-icon.git", + "_source": "git://github.com/PolymerElements/iron-icon.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icon" + "_originalSource": "PolymerElements/iron-icon" } \ No newline at end of file diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js index 36c5401260..01e6bd8102 100644 --- a/dashboard-ui/scripts/selectserver.js +++ b/dashboard-ui/scripts/selectserver.js @@ -26,9 +26,12 @@ break; case MediaBrowser.ConnectionState.ServerUpdateNeeded: { - Dashboard.alert({ - message: Globalize.translate('ServerUpdateNeeded', 'https://emby.media') - }); + Dashboard.alert(alert({ + + text: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media'), + html: Globalize.translate('core#ServerUpdateNeeded', 'https://emby.media') + + })); } break; default: diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 0c6963c3bf..e2eca8b538 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2099,10 +2099,7 @@ var AppInfo = {}; if (browser.mobile) { define("prompt", [embyWebComponentsBowerPath + "/prompt/nativeprompt"], returnFirstDependency); define("confirm", [embyWebComponentsBowerPath + "/confirm/nativeconfirm"], returnFirstDependency); - - // We have some alerts with markup - //define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency); - define("alert", [embyWebComponentsBowerPath + "/alert/alert"], returnFirstDependency); + define("alert", [embyWebComponentsBowerPath + "/alert/nativealert"], returnFirstDependency); } else { define("prompt", [embyWebComponentsBowerPath + "/prompt/prompt"], returnFirstDependency); define("confirm", [embyWebComponentsBowerPath + "/confirm/confirm"], returnFirstDependency);