diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index ab88ddeef6..6d2650212d 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -55,7 +55,6 @@ - diff --git a/dashboard-ui/bower_components/doc-ready/.bower.json b/dashboard-ui/bower_components/doc-ready/.bower.json index adda4287b4..d4d75eca65 100644 --- a/dashboard-ui/bower_components/doc-ready/.bower.json +++ b/dashboard-ui/bower_components/doc-ready/.bower.json @@ -39,6 +39,6 @@ "commit": "cec8e49744a1e18b14a711eea77e201bb70de544" }, "_source": "git://github.com/desandro/doc-ready.git", - "_target": "1.0.x", + "_target": "~1.0.4", "_originalSource": "doc-ready" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/eventie/.bower.json b/dashboard-ui/bower_components/eventie/.bower.json index 6b5b662fdc..917d217ea8 100644 --- a/dashboard-ui/bower_components/eventie/.bower.json +++ b/dashboard-ui/bower_components/eventie/.bower.json @@ -30,6 +30,6 @@ "commit": "14d2ca3df97da64c820829a8310f9198fbafbcfa" }, "_source": "git://github.com/desandro/eventie.git", - "_target": "~1.0.3", + "_target": "^1", "_originalSource": "eventie" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/get-style-property/.bower.json b/dashboard-ui/bower_components/get-style-property/.bower.json index 973f1966c0..d943fa3b04 100644 --- a/dashboard-ui/bower_components/get-style-property/.bower.json +++ b/dashboard-ui/bower_components/get-style-property/.bower.json @@ -31,6 +31,6 @@ "commit": "34fc5e4a0f252964ed2790138b8d7d30d04b55c1" }, "_source": "git://github.com/desandro/get-style-property.git", - "_target": "1.x", + "_target": "~1.0.4", "_originalSource": "get-style-property" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 4bf4a72b93..503ff0f3a9 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", + "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", "_release": "1.0.8", "_resolution": { "type": "version", "tag": "v1.0.8", "commit": "df29a9edcff3b4693707f1e3eebce5a1dc46e946" }, - "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-a11y-keys-behavior" + "_originalSource": "polymerelements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-flex-layout/.bower.json b/dashboard-ui/bower_components/iron-flex-layout/.bower.json index 49f7c42683..d3322e963e 100644 --- a/dashboard-ui/bower_components/iron-flex-layout/.bower.json +++ b/dashboard-ui/bower_components/iron-flex-layout/.bower.json @@ -27,14 +27,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0", "iron-component-page": "polymerelements/iron-component-page#^1.0.0" }, - "homepage": "https://github.com/PolymerElements/iron-flex-layout", + "homepage": "https://github.com/polymerelements/iron-flex-layout", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "00daa8acc95fe53d7cbbe5f9059241c4648ff22e" }, - "_source": "git://github.com/PolymerElements/iron-flex-layout.git", + "_source": "git://github.com/polymerelements/iron-flex-layout.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-flex-layout" + "_originalSource": "polymerelements/iron-flex-layout" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json index c8a556e720..73b5a092b4 100644 --- a/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-overlay-behavior/.bower.json @@ -34,14 +34,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-overlay-behavior", + "homepage": "https://github.com/polymerelements/iron-overlay-behavior", "_release": "1.0.9", "_resolution": { "type": "version", "tag": "v1.0.9", "commit": "87f7763d323fffa07357a08777ad831b7c2c2fb8" }, - "_source": "git://github.com/PolymerElements/iron-overlay-behavior.git", + "_source": "git://github.com/polymerelements/iron-overlay-behavior.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-overlay-behavior" + "_originalSource": "polymerelements/iron-overlay-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index ebb18c5b7b..52d44c1907 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.0.8", "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/neon-animation/.bower.json b/dashboard-ui/bower_components/neon-animation/.bower.json index fa31ad184d..67f935cf9f 100644 --- a/dashboard-ui/bower_components/neon-animation/.bower.json +++ b/dashboard-ui/bower_components/neon-animation/.bower.json @@ -54,7 +54,7 @@ "tag": "v1.0.8", "commit": "36656916b75a4715b025a03473620002c2650ee8" }, - "_source": "git://github.com/PolymerElements/neon-animation.git", + "_source": "git://github.com/polymerelements/neon-animation.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/neon-animation" + "_originalSource": "polymerelements/neon-animation" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 7387dbf119..3579b527b5 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -44,7 +44,7 @@ "tag": "v1.0.9", "commit": "d9c0398cbaf3881bef3533b5b2b6127fc4d0960c" }, - "_source": "git://github.com/polymerelements/paper-behaviors.git", + "_source": "git://github.com/PolymerElements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-behaviors" + "_originalSource": "PolymerElements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-item/.bower.json b/dashboard-ui/bower_components/paper-item/.bower.json index dd8382292f..e8f4749f31 100644 --- a/dashboard-ui/bower_components/paper-item/.bower.json +++ b/dashboard-ui/bower_components/paper-item/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-item", - "version": "1.0.6", + "version": "1.0.7", "description": "A material-design styled list item", "authors": [ "The Polymer Authors" @@ -39,11 +39,11 @@ "web-component-tester": "Polymer/web-component-tester#^3.3.0", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.0.6", + "_release": "1.0.7", "_resolution": { "type": "version", - "tag": "v1.0.6", - "commit": "803078d9942d1279fb6f4142b7522186d57f17c8" + "tag": "v1.0.7", + "commit": "9c265d81bb545f53ce9871ba86ae2f52c453f399" }, "_source": "git://github.com/PolymerElements/paper-item.git", "_target": "~1.0.2", diff --git a/dashboard-ui/bower_components/paper-item/bower.json b/dashboard-ui/bower_components/paper-item/bower.json index 57850c68e1..fc513e591d 100644 --- a/dashboard-ui/bower_components/paper-item/bower.json +++ b/dashboard-ui/bower_components/paper-item/bower.json @@ -1,6 +1,6 @@ { "name": "paper-item", - "version": "1.0.6", + "version": "1.0.7", "description": "A material-design styled list item", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-item/paper-item-shared-styles.html b/dashboard-ui/bower_components/paper-item/paper-item-shared-styles.html index 0bc190dd29..25fe13406b 100644 --- a/dashboard-ui/bower_components/paper-item/paper-item-shared-styles.html +++ b/dashboard-ui/bower_components/paper-item/paper-item-shared-styles.html @@ -38,6 +38,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN content: ''; background: currentColor; opacity: var(--dark-divider-opacity); + pointer-events: none; @apply(--paper-item-focused-before); } diff --git a/dashboard-ui/scripts/addpluginpage.js b/dashboard-ui/scripts/addpluginpage.js index d0696daf6d..edf4f97c40 100644 --- a/dashboard-ui/scripts/addpluginpage.js +++ b/dashboard-ui/scripts/addpluginpage.js @@ -233,12 +233,37 @@ }); - function performInstallation(packageName, guid, updateClass, version) { + function performInstallation(page, packageName, guid, updateClass, version) { - ApiClient.installPlugin(packageName, guid, updateClass, version).done(function () { + var developer = $('#developer', page).html().toLowerCase(); + + var alertCallback = function (confirmed) { + + if (confirmed) { + + Dashboard.showLoadingMsg(); + + ApiClient.installPlugin(packageName, guid, updateClass, version).done(function () { + + Dashboard.hideLoadingMsg(); + }); + } + }; + + if (developer != 'luke' && developer != 'ebr') { Dashboard.hideLoadingMsg(); - }); + + var msg = Globalize.translate('MessagePluginInstallDisclaimer'); + msg += '
'; + msg += '
'; + msg += Globalize.translate('PleaseConfirmPluginInstallation'); + + Dashboard.confirm(msg, Globalize.translate('HeaderConfirmPluginInstallation'), alertCallback); + + } else { + alertCallback(true); + } } function addPluginpage() { @@ -275,7 +300,7 @@ title: Globalize.translate('HeaderPluginInstallation') }); } else { - performInstallation(name, guid, vals[1], version); + performInstallation(page, name, guid, vals[1], version); } }); diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index 2d6dba9e83..32ec402738 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -23,9 +23,9 @@ { name: 'HeaderFavoriteShows', types: "Series", id: "favoriteShows", shape: getPosterShape(), showTitle: false }, { name: 'HeaderFavoriteEpisodes', types: "Episode", id: "favoriteEpisode", shape: getThumbShape(), preferThumb: false, showTitle: true, showParentTitle: true }, { name: 'HeaderFavoriteGames', types: "Game", id: "favoriteGames", shape: getSquareShape(), preferThumb: false, showTitle: true }, - { name: 'HeaderFavoriteArtists', types: "MusicArtist", id: "favoriteArtists", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true }, - { name: 'HeaderFavoriteAlbums', types: "MusicAlbum", id: "favoriteAlbums", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true }, - { name: 'HeaderFavoriteSongs', types: "Audio", id: "favoriteSongs", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayPlayButton: true } + { name: 'HeaderFavoriteArtists', types: "MusicArtist", id: "favoriteArtists", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayMoreButton: true, defaultAction: 'instantmix' }, + { name: 'HeaderFavoriteAlbums', types: "MusicAlbum", id: "favoriteAlbums", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayMoreButton: true, defaultAction: 'play' }, + { name: 'HeaderFavoriteSongs', types: "Audio", id: "favoriteSongs", shape: getSquareShape(), preferThumb: false, showTitle: true, overlayText: false, showParentTitle: true, centerText: true, overlayMoreButton: true, defaultAction: 'instantmix' } ]; } @@ -96,7 +96,9 @@ showDetailsMenu: true, centerText: section.centerText, overlayPlayButton: section.overlayPlayButton, - context: 'home-favorites' + overlayMoreButton: section.overlayMoreButton, + context: 'home-favorites', + defaultAction: section.defaultAction }); html += ''; diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index a7f289fc1e..8a0696e2ee 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -1642,7 +1642,7 @@ if (cast.PrimaryImageTag) { imgUrl = ApiClient.getScaledImageUrl(cast.Id, { - width: 100, + maxWidth: 100, tag: cast.PrimaryImageTag, type: "primary", minScale: 2 @@ -1727,7 +1727,7 @@ if (cast.PrimaryImageTag) { imgUrl = ApiClient.getScaledImageUrl(cast.Id, { - width: 100, + maxWidth: 100, tag: cast.PrimaryImageTag, type: "primary", minScale: 2 @@ -1745,7 +1745,7 @@ if (lazy) { html += '
'; } else { - html += '
'; + html += '
'; } //cardFooter diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index e57364fb8e..42eca18a97 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -175,7 +175,7 @@ for (i = 0, length = plugins.length; i < length; i++) { - html += '
'; + html += '
'; if (i > 0) { html += ''; @@ -299,7 +299,7 @@ for (i = 0, length = plugins.length; i < length; i++) { - html += '
'; + html += '
'; if (i > 0) { html += ''; diff --git a/dashboard-ui/strings/javascript/en-US.json b/dashboard-ui/strings/javascript/en-US.json index 7a52af234e..a78ce19ffe 100644 --- a/dashboard-ui/strings/javascript/en-US.json +++ b/dashboard-ui/strings/javascript/en-US.json @@ -918,5 +918,8 @@ "ErrorRemovingEmbyConnectAccount": "There was an error removing the Emby Connect account. Please ensure you have an active internet connection and try again.", "ErrorAddingEmbyConnectAccount": "There was an error adding the Emby Connect account. Please ensure the Emby account has been activated by following the instructions in the email sent after creating the account. If this email was not received please send an email to apps@emby.media from the email address used with the Emby account.", "HeaderFavoriteArtists": "Favorite Artists", - "HeaderFavoriteSongs": "Favorite Songs" + "HeaderFavoriteSongs": "Favorite Songs", + "HeaderConfirmPluginInstallation": "Confirm Plugin Installation", + "PleaseConfirmPluginInstallation": "Please click OK to confirm you've read the above and wish to proceed with the plugin installation.", + "MessagePluginInstallDisclaimer": "Plugins built by Emby community members are a great way to enhance your Emby experience with additional features and benefits. Before installing, please be aware of the effects they may have on your Emby Server, such as longer library scans, additional background processing, and decreased system stability." } \ No newline at end of file diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json index ff15403399..89fa7de3ca 100644 --- a/dashboard-ui/strings/javascript/javascript.json +++ b/dashboard-ui/strings/javascript/javascript.json @@ -928,5 +928,8 @@ "ErrorRemovingEmbyConnectAccount": "There was an error removing the Emby Connect account. Please ensure you have an active internet connection and try again.", "ErrorAddingEmbyConnectAccount": "There was an error adding the Emby Connect account. Please ensure the Emby account has been activated by following the instructions in the email sent after creating the account. If this email was not received please send an email to apps@emby.media from the email address used with the Emby account.", "HeaderFavoriteArtists": "Favorite Artists", - "HeaderFavoriteSongs": "Favorite Songs" + "HeaderFavoriteSongs": "Favorite Songs", + "HeaderConfirmPluginInstallation": "Confirm Plugin Installation", + "PleaseConfirmPluginInstallation": "Please click OK to confirm you've read the above and wish to proceed with the plugin installation.", + "MessagePluginInstallDisclaimer": "Plugins built by Emby community members are a great way to enhance your Emby experience with additional features and benefits. Before installing, please be aware of the effects they may have on your Emby Server, such as longer library scans, additional background processing, and decreased system stability." } diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index fafe78d575..6bf8b78aa9 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -19790,6 +19790,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN content: ''; background: currentColor; opacity: var(--dark-divider-opacity); + pointer-events: none; @apply(--paper-item-focused-before); }