-
-
-
-
+
diff --git a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
index 4023a83150..9f0d1a8531 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
@@ -10,15 +10,25 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
var mediaType = item.MediaType;
var isFolder = item.IsFolder;
var itemId = item.Id;
+ var channelId = item.ChannelId;
var serverId = item.ServerId;
var resumePositionTicks = item.UserData ? item.UserData.PlaybackPositionTicks : null;
var showExternalPlayer = isMobileApp && mediaType == 'Video' && !isFolder && appSettings.enableExternalPlayers();
+ var playableItemId = itemType == 'Program' ? channelId : itemId;
+
if (!resumePositionTicks && mediaType != "Audio" && !isFolder && !showExternalPlayer) {
- playbackManager.play({
- items: [item]
- });
+ if (itemType == 'Program') {
+ playbackManager.play({
+ ids: [channelId],
+ serverId: serverId
+ });
+ } else {
+ playbackManager.play({
+ items: [item]
+ });
+ }
return;
}
@@ -79,18 +89,18 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
case 'play':
playbackManager.play({
- ids: [itemId],
- serverId: item.ServerId
+ ids: [playableItemId],
+ serverId: serverId
});
break;
case 'externalplayer':
- LibraryBrowser.playInExternalPlayer(itemId);
+ LibraryBrowser.playInExternalPlayer(playableItemId);
break;
case 'resume':
playbackManager.play({
- ids: [itemId],
+ ids: [playableItemId],
startPositionTicks: resumePositionTicks,
- serverId: item.ServerId
+ serverId: serverId
});
break;
case 'queue':
diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js
index 79dcda8779..f3c03b048d 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js
@@ -168,6 +168,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g
var item = {
Type: card.getAttribute('data-type'),
Id: card.getAttribute('data-id'),
+ ChannelId: card.getAttribute('data-channelid'),
ServerId: card.getAttribute('data-serverid'),
MediaType: card.getAttribute('data-mediatype'),
IsFolder: card.getAttribute('data-isfolder') == 'true',
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index cad9543436..5320b592cc 100644
--- a/dashboard-ui/bower_components/polymer/.bower.json
+++ b/dashboard-ui/bower_components/polymer/.bower.json
@@ -31,14 +31,14 @@
"web-component-tester": "*"
},
"private": true,
- "homepage": "https://github.com/polymer/polymer",
+ "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.0",
"_resolution": {
"type": "version",
"tag": "v1.6.0",
"commit": "8715c83bf04a228de00ec662ed43eb6141e61b91"
},
- "_source": "git://github.com/polymer/polymer.git",
+ "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0",
- "_originalSource": "polymer/polymer"
+ "_originalSource": "Polymer/polymer"
}
\ No newline at end of file
diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index 6b9933ad5b..da01eb1160 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -3,23 +3,7 @@
text-align: left;
position: relative;
contain: style;
- /*box-shadow: 0 1px 4px 0 rgba(0,0,0,0.37);*/
}
-
- /*.itemsContainer .card {
- contain: layout style;
-}
-
-.itemsContainer {
- display: flex;
- flex-direction: row;
- flex-wrap: wrap;
-}
-
- .itemsContainer.smoothScrollX, .itemsContainer.hiddenScrollX {
- display: block;
- }*/
-
.card, .card a {
text-decoration: none;
font-weight: 400 !important;
@@ -129,26 +113,6 @@
opacity: .5;
}
- /*.preview-overlay-container {
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- -moz-opacity: 0;
- opacity: 0;
- filter: alpha(opacity=0);
- -webkit-transition: all .25s ease;
- -moz-transition: all .25s ease;
- -o-transition: all .25s ease;
- transition: all .25s ease;
- background: rgba(0,0,0,0.4);
- cursor: pointer;
- height: 100%;
- left: 0;
- position: absolute;
- top: 0;
- width: 100%;
-}*/
-
.cardContent .cardFooter {
position: absolute;
bottom: 0;
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index c9ba5f0179..74beb5dffd 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -353,7 +353,7 @@ body:not(.dashboardDocument) .btnNotifications {
}
.darkDrawer {
- background-color: #1D1D20 !important;
+ background-color: #1C1C1F !important;
/*background-color: rgba(40,40,40,.8) !important;
-webkit-backdrop-filter: blur(5px);
backdrop-filter: blur(5px);*/
diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css
index 7ff072b6cb..04b1583f0e 100644
--- a/dashboard-ui/css/nowplayingbar.css
+++ b/dashboard-ui/css/nowplayingbar.css
@@ -59,7 +59,7 @@
/* Above everything, except for the video player and popup overlays */
z-index: 1097;
color: #fff;
- background-color: #2b2b2b;
+ background-color: #1C1C1F;
text-align: center;
display: flex;
flex-direction: row;
@@ -101,12 +101,12 @@
}
.nowPlayingBar, .nowPlayingImage img {
- height: 80px;
+ height: 70px;
}
.nowPlayingBar .nowPlayingImage {
- width: 80px;
- height: 80px;
+ width: 70px;
+ height: 70px;
background-position: center center;
background-repeat: no-repeat;
background-size: contain;
@@ -160,7 +160,7 @@
.nowPlayingBarCenter {
vertical-align: middle;
text-align: center;
- margin-top: 12px;
+ margin-top: 7px;
/* Need this to make sure it's on top of nowPlayingBarPositionContainer so that buttons are fully clickable */
z-index: 2;
position: absolute;
@@ -171,12 +171,16 @@
.nowPlayingBarPositionContainer {
position: absolute !important;
- left: 80px;
+ left: 70px;
top: -8px;
right: 0;
z-index: 1;
}
+ .nowPlayingBarPositionContainer .mdl-slider__background-upper {
+ background: #333;
+ }
+
.noMediaProgress .nowPlayingBarPositionContainer {
display: none;
}
@@ -244,19 +248,6 @@
display: none !important;
}
- .nowPlayingBar {
- height: 70px;
- }
-
- .nowPlayingBar .nowPlayingImage {
- height: 70px;
- width: 70px;
- }
-
- .nowPlayingBarPositionContainer {
- left: 70px;
- }
-
.toggleRepeatButton {
display: none;
}
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 6f798d33f9..1984c58dce 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1481,7 +1481,7 @@
text = itemHelper.getDisplayName(item);
}
- var html = '