diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index c19dd451f..d801ee196 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.183", - "_release": "1.4.183", + "version": "1.4.186", + "_release": "1.4.186", "_resolution": { "type": "version", - "tag": "1.4.183", - "commit": "0548902d94131fb45ba17c421186014b0bed5e18" + "tag": "1.4.186", + "commit": "58f6ba7c53f72e861456632e6c278b6d9da2bf9b" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 4d954e484..2de5a1c4c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -702,11 +702,11 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo return html; } - function getCardFooterText(item, options, showTitle, forceName, imgUrl, footerClass, progressHtml, isOuterFooter) { + function getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerClass, progressHtml, isOuterFooter) { var html = ''; - var showOtherText = isOuterFooter ? !options.overlayText : options.overlayText; + var showOtherText = isOuterFooter ? !overlayText : overlayText; if (isOuterFooter && options.cardLayout && !layoutManager.tv) { var moreIcon = appHost.moreIcon == 'dots-horiz' ? '' : ''; @@ -719,7 +719,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (showOtherText) { var parentTitleUnderneath = item.Type == 'MusicAlbum' || item.Type == 'Audio' || item.Type == 'MusicVideo'; - if (options.showParentTitle && !parentTitleUnderneath) { + if ((options.showParentTitle || options.showParentTitleOrTitle) && !parentTitleUnderneath) { if (isOuterFooter && item.Type == 'Episode' && item.SeriesName && item.SeriesId) { @@ -732,12 +732,16 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } else { - lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")); + var parentTitle = item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""); + + if (parentTitle || options.showParentTitle) { + lines.push(parentTitle); + } } } } - if (showTitle) { + if (showTitle || forceName || (options.showParentTitleOrTitle && !lines.length)) { var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : itemHelper.getDisplayName(item); @@ -834,7 +838,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo lines.push(airTimeText || ''); } - if (item.Type == 'TvChannel') { + if (options.showCurrentProgram && item.Type == 'TvChannel') { if (item.CurrentProgram) { lines.push(itemHelper.getDisplayName(item.CurrentProgram)); @@ -869,7 +873,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo } } - if (showTitle && forceName && lines.length == 1) { + if (showTitle && forceName && overlayText && lines.length == 1) { lines = []; } @@ -1022,7 +1026,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo var overlayText = options.overlayText; if (forceName && !options.cardLayout) { - showTitle = imgUrl; if (overlayText == null) { overlayText = true; @@ -1061,7 +1064,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo if (overlayText) { footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter'; - innerCardFooter += getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, false); + innerCardFooter += getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, false); footerOverlayed = true; } else if (progressHtml) { @@ -1080,7 +1083,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo var outerCardFooter = ''; if (!overlayText && !footerOverlayed) { footerCssClass = options.cardLayout ? 'cardFooter visualCardBox-cardFooter' : 'cardFooter transparent'; - outerCardFooter = getCardFooterText(item, options, showTitle, forceName, imgUrl, footerCssClass, progressHtml, true); + outerCardFooter = getCardFooterText(item, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, true); } if (outerCardFooter && !options.cardLayout && options.allowBottomPadding !== false) { @@ -1208,9 +1211,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo var mediaTypeData = item.MediaType ? (' data-mediatype="' + item.MediaType + '"') : ''; var collectionTypeData = item.CollectionType ? (' data-collectiontype="' + item.CollectionType + '"') : ''; var channelIdData = item.ChannelId ? (' data-channelid="' + item.ChannelId + '"') : ''; + var contextData = options.context ? (' data-context="' + options.context + '"') : ''; return '\ -<' + tagName + ' data-index="' + index + '"' + timerAttributes + actionAttribute + ' data-isfolder="' + (item.IsFolder || false) + '" data-serverid="' + (item.ServerId) + '" data-id="' + (item.Id || item.ItemId) + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + ' data-prefix="' + prefix + '" class="' + className + '"> \ +<' + tagName + ' data-index="' + index + '"' + timerAttributes + actionAttribute + ' data-isfolder="' + (item.IsFolder || false) + '" data-serverid="' + (item.ServerId) + '" data-id="' + (item.Id || item.ItemId) + '" data-type="' + item.Type + '"' + mediaTypeData + collectionTypeData + channelIdData + positionTicksData + collectionIdData + playlistIdData + contextData + ' data-prefix="' + prefix + '" class="' + className + '"> \ ' + cardImageContainerOpen + innerCardFooter + cardImageContainerClose + cardContentClose + overlayButtons + cardScalableClose + outerCardFooter + cardBoxClose + '\ '; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/datetime.js b/dashboard-ui/bower_components/emby-webcomponents/datetime.js index 50c8fbc61..5bf42a493 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/datetime.js +++ b/dashboard-ui/bower_components/emby-webcomponents/datetime.js @@ -104,7 +104,7 @@ }(); function toLocaleDateString(date) { - + var currentLocale = globalize.getCurrentLocale(); return currentLocale && toLocaleTimeStringSupportsLocales ? @@ -160,10 +160,20 @@ return time; } + function isRelativeDay(date, offsetInDays) { + var yesterday = new Date(); + var day = yesterday.getDate() + offsetInDays; + + yesterday.setDate(day); // automatically adjusts month/year appropriately + + return date.getFullYear() == yesterday.getFullYear() && date.getMonth() == yesterday.getMonth() && date.getDate() == day; + } + return { parseISO8601Date: parseISO8601Date, getDisplayRunningTime: getDisplayRunningTime, toLocaleDateString: toLocaleDateString, - getDisplayTime: getDisplayTime + getDisplayTime: getDisplayTime, + isRelativeDay: isRelativeDay }; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css index 88cf918b6..6b51f326e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.css @@ -254,6 +254,10 @@ height: 4em; } +.channelPrograms-tv, .channelHeaderCell-tv { + height: 3.2em; +} + .channelTimeslotHeader { border-right-color: transparent; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js index c9012b9cd..6ffb03d5d 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js +++ b/dashboard-ui/bower_components/emby-webcomponents/guide/guide.js @@ -294,7 +294,9 @@ return curr.ChannelId == channel.Id; }); - html += '
'; + var cssClass = layoutManager.tv ? 'channelPrograms channelPrograms-tv' : 'channelPrograms'; + + html += '
'; for (var i = 0, length = programs.length; i < length; i++) { @@ -450,6 +452,10 @@ var cssClass = 'channelHeaderCell clearButton itemAction lazy'; + if (layoutManager.tv) { + cssClass += ' channelHeaderCell-tv'; + } + html += '