';
+ } else {
+ html += '
';
+ }
+ if (isVertical) {
+ html += '
' + newIndexValue + '
';
+ } else {
+ html += '
' + newIndexValue + '
';
+ }
+ if (isVertical) {
+ html += '
';
+ }
+ currentIndexValue = newIndexValue;
+ hasOpenSection = true;
+ }
+ }
+
+ if (options.rows && itemsInRow == 0) {
+
+ if (hasOpenRow) {
+ html += '
';
+ hasOpenRow = false;
+ }
+
+ html += '
';
+ hasOpenRow = true;
+ }
+
+ var cardClass = className;
+ html += buildCard(i, item, apiClient, options, cardClass);
+
+ itemsInRow++;
+
+ if (options.rows && itemsInRow >= options.rows) {
+ html += '
';
+ hasOpenRow = false;
+ itemsInRow = 0;
+ }
+ }
+
+ if (hasOpenRow) {
+ html += '
';
+ }
+
+ if (hasOpenSection) {
+ html += '
';
+ hasOpenRow = true;
+ }
+
+ var cardClass = className;
+ currentItemHtml += buildCard(i, renderItem, apiClient, options, cardClass);
+
+ itemsInRow++;
+
+ if (options.rows && itemsInRow >= options.rows) {
+ currentItemHtml += '
';
+ hasOpenRow = false;
+ itemsInRow = 0;
+ }
+
+ return currentItemHtml;
+
+ }).join('');
+
+
+ if (showMoreButton) {
+ html += '') : ('
');
+ var cardImageContainerClose = '
';
+
+ if (separateCardBox) {
+ cardImageContainerOpen = '
' + cardImageContainerOpen;
+ cardImageContainerClose += '
';
+ }
+
+ var indicatorsHtml = '';
+
+ indicatorsHtml += indicators.getTimerIndicator(item);
+
+ if (options.showGroupCount) {
+
+ indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
+ minCount: 1
+ });
+ }
+ else {
+ indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
+ }
+
+ if (indicatorsHtml) {
+ cardImageContainerOpen += '
' + indicatorsHtml + '
';
+ }
+
+ var showTitle = options.showTitle || imgInfo.forceName || item.Type == 'PhotoAlbum';
+ var showParentTitle = options.showParentTitle || (imgInfo.forceName && item.Type == 'Episode');
+
+ if (!imgUrl) {
+ var defaultName = item.EpisodeTitle ? item.Name : itemHelper.getDisplayName(item);
+ cardImageContainerOpen += '
' + defaultName + '
';
+ }
+
+ var nameHtml = '';
+
+ if (showParentTitle) {
+ nameHtml += '
' + (item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || "")) + '
';
+ }
+
+ if (showTitle) {
+ var nameClass = 'cardText';
+ nameHtml += '
' + itemHelper.getDisplayName(item) + '
';
+ }
+
+ var innerCardFooterClass = 'innerCardFooter';
+ var progressHtml = indicators.getProgressBarHtml(item);
+
+ if (progressHtml) {
+ nameHtml += progressHtml;
+ innerCardFooterClass += " fullInnerCardFooter";
+ }
+
+ var innerCardFooter = '';
+
+ if (nameHtml && imgUrl) {
+ innerCardFooter += '';
+ }
+
+ var data = '';
+
+ var action = options.action || 'link';
+
+ var tagName = 'button';
+
+ var prefix = (item.SortName || item.Name || '')[0];
+
+ if (prefix) {
+ prefix = prefix.toUpperCase();
+ }
+
+ var timerAttributes = '';
+ if (item.TimerId) {
+ timerAttributes += ' data-timerid="' + item.TimerId + '"';
+ }
+ if (item.SeriesTimerId) {
+ timerAttributes += ' data-seriestimerid="' + item.SeriesTimerId + '"';
+ }
+
+ var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
+ var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
+ var playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : '';
+
+ return '\
+<' + tagName + ' data-index="' + index + '"' + timerAttributes + ' data-action="' + action + '" data-isfolder="' + (item.IsFolder || false) + '" data-serverid="' + (item.ServerId) + '" data-id="' + (item.Id || item.ItemId) + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '"' + positionTicksData + collectionIdData + playlistIdData + ' data-prefix="' + prefix + '" class="' + className + '"> \
+' + cardImageContainerOpen + innerCardFooter + data + cardImageContainerClose + '\
+';
+ }
+
+ function buildCards(items, options) {
+
+ // Abort if the container has been disposed
+ if (!document.body.contains(options.itemsContainer)) {
+ return;
+ }
+
+ if (options.parentContainer) {
+ if (items.length) {
+ options.parentContainer.classList.remove('hide');
+ } else {
+ options.parentContainer.classList.add('hide');
+ return;
+ }
+ }
+
+ var apiClient = connectionManager.currentApiClient();
+
+ var html = buildCardsHtmlInternal(items, apiClient, options);
+
+ if (html) {
+
+ if (options.itemsContainer.cardBuilderHtml != html) {
+ options.itemsContainer.innerHTML = html;
+
+ if (items.length < 50) {
+ options.itemsContainer.cardBuilderHtml = html;
+ } else {
+ options.itemsContainer.cardBuilderHtml = null;
+ }
+ }
+
+ imageLoader.lazyChildren(options.itemsContainer);
+ } else {
+
+ options.itemsContainer.innerHTML = html;
+ options.itemsContainer.cardBuilderHtml = null;
+ }
+
+ if (options.autoFocus) {
+ focusManager.autoFocus(options.itemsContainer, true);
+ }
+
+ if (options.indexBy == 'Genres') {
+ options.itemsContainer.addEventListener('click', onItemsContainerClick);
+ }
+ }
+
+ function parentWithClass(elem, className) {
+
+ while (!elem.classList || !elem.classList.contains(className)) {
+ elem = elem.parentNode;
+
+ if (!elem) {
+ return null;
+ }
+ }
+
+ return elem;
+ }
+
+ function onItemsContainerClick(e) {
+
+ var listItemsMoreButton = parentWithClass(e.target, 'listItemsMoreButton');
+
+ if (listItemsMoreButton) {
+
+ var value = listItemsMoreButton.getAttribute('data-indexvalue');
+ var parentid = listItemsMoreButton.getAttribute('data-parentid');
+
+ Emby.Page.showGenre({
+ ParentId: parentid,
+ Id: value
+ });
+ }
+ }
+
+ function ensureIndicators(card, indicatorsElem) {
+
+ if (indicatorsElem) {
+ return indicatorsElem;
+ }
+
+ indicatorsElem = card.querySelector('.indicators');
+
+ if (!indicatorsElem) {
+
+ var cardImageContainer = card.querySelector('.cardImageContainer');
+ indicatorsElem = document.createElement('div');
+ indicatorsElem.classList.add('indicators');
+ cardImageContainer.appendChild(indicatorsElem);
+ }
+
+ return indicatorsElem;
+ }
+
+ function updateUserData(card, userData) {
+
+ var type = card.getAttribute('data-type');
+ var enableCountIndicator = type == 'Series' || type == 'BoxSet' || type == 'Season';
+ var indicatorsElem;
+
+ if (userData.Played) {
+
+ var playedIndicator = card.querySelector('.playedIndicator');
+
+ if (!playedIndicator) {
+
+ playedIndicator = document.createElement('div');
+ playedIndicator.classList.add('playedIndicator');
+ indicatorsElem = ensureIndicators(card, indicatorsElem);
+ indicatorsElem.appendChild(playedIndicator);
+ }
+ playedIndicator.innerHTML = '
check';
+ } else {
+
+ var playedIndicator = card.querySelector('.playedIndicator');
+ if (playedIndicator) {
+
+ playedIndicator.parentNode.removeChild(playedIndicator);
+ }
+ }
+ if (userData.UnplayedItemCount) {
+ var countIndicator = card.querySelector('.countIndicator');
+
+ if (!countIndicator) {
+
+ countIndicator = document.createElement('div');
+ countIndicator.classList.add('countIndicator');
+ indicatorsElem = ensureIndicators(card, indicatorsElem);
+ indicatorsElem.appendChild(countIndicator);
+ }
+ countIndicator.innerHTML = userData.UnplayedItemCount;
+ } else if (enableCountIndicator) {
+
+ var countIndicator = card.querySelector('.countIndicator');
+ if (countIndicator) {
+
+ countIndicator.parentNode.removeChild(countIndicator);
+ }
+ }
+
+ var progressHtml = indicators.getProgressBarHtml({
+ Type: type,
+ UserData: userData,
+ MediaType: 'Video'
+ });
+
+ if (progressHtml) {
+
+ var itemProgressBar = card.querySelector('.itemProgressBar');
+
+ if (!itemProgressBar) {
+ itemProgressBar = document.createElement('div');
+ itemProgressBar.classList.add('itemProgressBar');
+
+ var innerCardFooter = card.querySelector('.innerCardFooter');
+ if (!innerCardFooter) {
+ innerCardFooter = document.createElement('div');
+ innerCardFooter.classList.add('innerCardFooter');
+ var cardImageContainer = card.querySelector('.cardImageContainer');
+ cardImageContainer.appendChild(innerCardFooter);
+ }
+ innerCardFooter.appendChild(itemProgressBar);
+ }
+
+ itemProgressBar.innerHTML = progressHtml;
+ }
+ else {
+
+ var itemProgressBar = card.querySelector('.itemProgressBar');
+ if (itemProgressBar) {
+ itemProgressBar.parentNode.removeChild(itemProgressBar);
+ }
+ }
+ }
+
+ function onUserDataChanged(userData) {
+
+ var cards = document.querySelectorAll('.card[data-id="' + userData.ItemId + '"]');
+
+ for (var i = 0, length = cards.length; i < length; i++) {
+ updateUserData(cards[i], userData);
+ }
+ }
+
+ return {
+ buildCardsHtml: buildCardsHtml,
+ buildCards: buildCards,
+ onUserDataChanged: onUserDataChanged
+ };
+ });
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js
new file mode 100644
index 0000000000..b7f20c9fe4
--- /dev/null
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js
@@ -0,0 +1,115 @@
+define(['datetime', 'imageLoader', 'itemShortcuts'], function (datetime, imageLoader, itemShortcuts) {
+
+ function buildChapterCardsHtml(item, chapters, options) {
+
+ var className = 'card scalableCard itemAction chapterCard';
+
+ var mediaStreams = ((item.MediaSources || [])[0] || {}).MediaStreams || [];
+ var videoStream = mediaStreams.filter(function (i) {
+ return i.Type == 'Video';
+ })[0] || {};
+
+ var shape = 'backdropCard';
+
+ if (videoStream.Width && videoStream.Height) {
+
+ if ((videoStream.Width / videoStream.Height) <= 1.34) {
+ shape = 'squareCard';
+ }
+ }
+
+ className += ' ' + shape;
+
+ if (options.block || options.rows) {
+ className += ' block';
+ }
+
+ var html = '';
+ var itemsInRow = 0;
+
+ for (var i = 0, length = chapters.length; i < length; i++) {
+
+ if (options.rows && itemsInRow == 0) {
+ html += '
';
+ }
+
+ var chapter = chapters[i];
+
+ html += buildChapterCard(item, chapter, options, className);
+ itemsInRow++;
+
+ if (options.rows && itemsInRow >= options.rows) {
+ itemsInRow = 0;
+ html += '
';
+ }
+ }
+
+ return html;
+ }
+
+ function buildChapterCard(item, chapter, options, className) {
+
+ var imgUrl = chapter.images ? chapter.images.primary : '';
+
+ var cardImageContainerClass = 'cardImageContainer';
+ if (options.coverImage) {
+ cardImageContainerClass += ' coveredImage';
+ }
+ var dataAttributes = ' data-action="play" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-type="' + item.Type + '" data-mediatype="' + item.MediaType + '" data-positionticks="' + chapter.StartPositionTicks + '"';
+ var cardImageContainer = imgUrl ? ('
') : ('
');
+
+ var nameHtml = '';
+ nameHtml += '
' + chapter.Name + '
';
+ nameHtml += '
' + datetime.getDisplayRunningTime(chapter.StartPositionTicks) + '
';
+
+ var html = '\
+
\
+'
+ ;
+
+ return html;
+ }
+
+ function buildChapterCards(item, chapters, options) {
+
+ // Abort if the container has been disposed
+ if (!document.body.contains(options.parentContainer)) {
+ return;
+ }
+
+ if (options.parentContainer) {
+ if (chapters.length) {
+ options.parentContainer.classList.remove('hide');
+ } else {
+ options.parentContainer.classList.add('hide');
+ return;
+ }
+ }
+
+ var html = buildChapterCardsHtml(item, chapters, options);
+
+ options.itemsContainer.innerHTML = html;
+
+ imageLoader.lazyChildren(options.itemsContainer);
+
+ itemShortcuts.off(options.itemsContainer);
+ itemShortcuts.on(options.itemsContainer);
+ }
+
+ return {
+ buildChapterCards: buildChapterCards
+ };
+
+});
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js
new file mode 100644
index 0000000000..d468eb266b
--- /dev/null
+++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/peoplecardbuilder.js
@@ -0,0 +1,110 @@
+define(['imageLoader', 'itemShortcuts'], function (imageLoader, itemShortcuts) {
+
+ function buildPeopleCardsHtml(people, options) {
+
+ var className = 'card portraitCard personCard';
+
+ if (options.block || options.rows) {
+ className += ' block';
+ }
+
+ var html = '';
+ var itemsInRow = 0;
+
+ var serverId = options.serverId;
+
+ for (var i = 0, length = people.length; i < length; i++) {
+
+ if (options.rows && itemsInRow == 0) {
+ html += '
';
+ }
+
+ var person = people[i];
+
+ html += buildPersonCard(person, serverId, options, className);
+ itemsInRow++;
+
+ if (options.rows && itemsInRow >= options.rows) {
+ itemsInRow = 0;
+ html += '
';
+ }
+ }
+
+ return html;
+ }
+
+ function buildPersonCard(person, serverId, options, className) {
+
+ className += " itemAction scalableCard";
+
+ var imgUrl = person.images ? person.images.primary : '';
+
+ var cardImageContainerClass = 'cardImageContainer';
+ if (options.coverImage) {
+ cardImageContainerClass += ' coveredImage';
+ }
+ var cardImageContainer = imgUrl ? ('
') : ('
');
+
+ var nameHtml = '';
+ nameHtml += '
' + person.Name + '
';
+
+ if (person.Role) {
+ nameHtml += '
as ' + person.Role + '
';
+ }
+ else if (person.Type) {
+ nameHtml += '
' + Globalize.translate('core#' + person.Type) + '
';
+ } else {
+ nameHtml += '
';
+ }
+
+ var html = '\
+
\
+'
+ ;
+
+ return html;
+ }
+
+ function buildPeopleCards(items, options) {
+
+ // Abort if the container has been disposed
+ if (!document.body.contains(options.parentContainer)) {
+ return;
+ }
+
+ if (options.parentContainer) {
+ if (items.length) {
+ options.parentContainer.classList.remove('hide');
+ } else {
+ options.parentContainer.classList.add('hide');
+ return;
+ }
+ }
+
+ var html = buildPeopleCardsHtml(items, options);
+
+ options.itemsContainer.innerHTML = html;
+
+ imageLoader.lazyChildren(options.itemsContainer);
+
+ itemShortcuts.off(options.itemsContainer);
+ itemShortcuts.on(options.itemsContainer);
+ }
+
+ return {
+ buildPeopleCards: buildPeopleCards
+ };
+
+});
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
index dc8c88f898..ec64b305aa 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/listview/listview.js
@@ -196,9 +196,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
var playlistIdData = options.playlistId ? (' data-playlistid="' + options.playlistId + '"') : '';
- var seriesIdData = item.SeriesId ? (' data-seriesid="' + item.SeriesId + '"') : '';
- html += '<' + outerTagName + ' class="' + cssClass + '" data-index="' + i + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-mediatype="' + item.MediaType + '" data-type="' + item.Type + '"' + positionTicksData + collectionIdData + playlistIdData + seriesIdData + '>';
+ html += '<' + outerTagName + ' class="' + cssClass + '" data-index="' + i + '"' + playlistItemId + ' data-action="' + action + '" data-isfolder="' + item.IsFolder + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-mediatype="' + item.MediaType + '" data-type="' + item.Type + '"' + positionTicksData + collectionIdData + playlistIdData + '>';
if (!clickEntireItem && options.dragHandle) {
html += '
';
diff --git a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
index 9f0d1a8531..72552cade0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/playmenu.js
@@ -15,20 +15,13 @@ define(['actionsheet', 'datetime', 'playbackManager', 'globalize', 'appSettings'
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) {
- if (itemType == 'Program') {
- playbackManager.play({
- ids: [channelId],
- serverId: serverId
- });
- } else {
- playbackManager.play({
- items: [item]
- });
- }
+ playbackManager.play({
+ ids: [playableItemId],
+ serverId: serverId
+ });
return;
}
diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json
index 5320b592cc..cad9543436 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/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 40eea361ec..5150c2f2d5 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -802,13 +802,6 @@
});
}
- if (item.SeriesId) {
- atts.push({
- name: 'seriesid',
- value: item.SeriesId
- });
- }
-
if (options.collectionId) {
atts.push({
name: 'collectionid',
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index f1474dd6e6..91f2a54f58 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1429,6 +1429,11 @@ var AppInfo = {};
define("backdrop", [embyWebComponentsBowerPath + "/backdrop/backdrop"], returnFirstDependency);
define("fetchHelper", [embyWebComponentsBowerPath + "/fetchhelper"], returnFirstDependency);
+ define("cardStyle", ['css!' + embyWebComponentsBowerPath + "/cardbuilder/card"], returnFirstDependency);
+ define("cardBuilder", [embyWebComponentsBowerPath + "/cardbuilder/cardbuilder"], returnFirstDependency);
+ define("peoplecardbuilder", [embyWebComponentsBowerPath + "/cardbuilder/peoplecardbuilder"], returnFirstDependency);
+ define("chaptercardbuilder", [embyWebComponentsBowerPath + "/cardbuilder/chaptercardbuilder"], returnFirstDependency);
+
define("tvguide", [embyWebComponentsBowerPath + "/guide/guide", 'embyRouter'], returnFirstDependency);
define("voiceDialog", [embyWebComponentsBowerPath + "/voice/voicedialog"], returnFirstDependency);
define("voiceReceiver", [embyWebComponentsBowerPath + "/voice/voicereceiver"], returnFirstDependency);