From aaad0350ae5a993f343305203b276ea2d330b8d6 Mon Sep 17 00:00:00 2001 From: cvium Date: Sat, 12 Jan 2019 07:54:05 +0100 Subject: [PATCH 1/3] make card titles clickable --- .../cardbuilder/cardbuilder.js | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 439c8227a3..e6088d6ca6 100644 --- a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -806,6 +806,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana } var cssClass = options.centerText ? "cardText cardTextCentered" : "cardText"; + var serverId = item.ServerId || options.serverId; var lines = []; var parentTitleUnderneath = item.Type === 'MusicAlbum' || item.Type === 'Audio' || item.Type === 'MusicVideo'; @@ -819,7 +820,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana if (item.SeriesId) { lines.push(getTextActionButton({ Id: item.SeriesId, - ServerId: item.ServerId, + ServerId: serverId, Name: item.SeriesName, Type: 'Series', IsFolder: true @@ -859,8 +860,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana var name = options.showTitle === 'auto' && !item.IsFolder && item.MediaType === 'Photo' ? '' : itemHelper.getDisplayName(item, { includeParentInfo: options.includeParentInfoInTitle }); - - lines.push(name); + + lines.push(getTextActionButton({ + Id: item.Id, + ServerId: serverId, + Name: name, + Type: item.Type, + IsFolder: true + })); } if (showOtherText) { @@ -869,7 +876,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana if (isOuterFooter && item.AlbumArtists && item.AlbumArtists.length) { item.AlbumArtists[0].Type = 'MusicArtist'; item.AlbumArtists[0].IsFolder = true; - lines.push(getTextActionButton(item.AlbumArtists[0], null, item.ServerId)); + lines.push(getTextActionButton(item.AlbumArtists[0], null, serverId)); } else { lines.push(isUsingLiveTvNaming(item) ? item.Name : (item.SeriesName || item.Series || item.Album || item.AlbumArtist || item.GameSystem || "")); } @@ -960,7 +967,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana lines.push(getTextActionButton({ Id: item.ChannelId, - ServerId: item.ServerId, + ServerId: serverId, Name: item.ChannelName, Type: 'TvChannel', MediaType: item.MediaType, From d38d4934131a4bfd54c823704f835cbf6e1e209f Mon Sep 17 00:00:00 2001 From: cvium Date: Sat, 12 Jan 2019 07:58:01 +0100 Subject: [PATCH 2/3] change to item.IsFolder --- .../emby-webcomponents/cardbuilder/cardbuilder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index e6088d6ca6..6f96bfb9b4 100644 --- a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -866,7 +866,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana ServerId: serverId, Name: name, Type: item.Type, - IsFolder: true + IsFolder: item.IsFolder })); } From 8b02d5c43c015220af2fa6fa24925c17021d4cc3 Mon Sep 17 00:00:00 2001 From: cvium Date: Sat, 12 Jan 2019 19:40:12 +0100 Subject: [PATCH 3/3] add colleciontype to get proper routing --- .../emby-webcomponents/cardbuilder/cardbuilder.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 6f96bfb9b4..f5c10ea658 100644 --- a/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/src/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -866,6 +866,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana ServerId: serverId, Name: name, Type: item.Type, + CollectionType: item.CollectionType, IsFolder: item.IsFolder })); }