${ButtonSync}
@@ -113,7 +113,7 @@
-
+
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index 1723462400..4d3d959510 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -92,7 +92,8 @@
}
else if (view == "Poster") {
- posterOptions.showTitle = context != 'photos';
+ posterOptions.showTitle = context == 'photos' ? 'auto' : true;
+ posterOptions.overlayText = context == 'photos';
html = LibraryBrowser.getPosterViewHtml(posterOptions);
}
@@ -180,7 +181,9 @@
var info = LibraryBrowser.getListItemInfo(this);
if (info.mediaType == 'Photo') {
- Photos.startSlideshow(page, query, info.id);
+ require(['scripts/photos'], function () {
+ Photos.startSlideshow(page, query, info.id);
+ });
return false;
}
}
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5fe8e444c1..359a944d04 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -186,6 +186,7 @@
},
enableFullPaperTabs: function () {
+
return AppInfo.isNativeApp;
},
@@ -294,6 +295,45 @@
}
},
+ showTab: function (url, index) {
+
+ if (!LibraryBrowser.enableFullPaperTabs()) {
+
+ if (index) {
+ url = replaceQueryString(url, 'tab', index);
+ }
+ Dashboard.navigate(url);
+ return;
+ }
+
+ $(document).one('pageshowready', '.page', function () {
+
+ if (getWindowUrl().toLowerCase().indexOf(url.toLowerCase()) != -1) {
+
+ var pages = this.querySelector('neon-animated-pages');
+
+ if (pages) {
+
+ var entryAnimation = pages.entryAnimation;
+ var exitAnimation = pages.exitAnimation;
+ pages.entryAnimation = null;
+ pages.exitAnimation = null;
+
+ var tabs = this.querySelector('paper-tabs');
+ var noSlide = tabs.noSlide;
+ tabs.noSlide = true;
+ tabs.selected = index;
+
+ pages.entryAnimation = entryAnimation;
+ pages.exitAnimation = exitAnimation;
+ tabs.noSlide = noSlide;
+ }
+ }
+ });
+
+ Dashboard.navigate(url);
+ },
+
canShare: function (item, user) {
return user.Policy.EnablePublicSharing;
@@ -1503,6 +1543,8 @@
cssClass += " fullWidthCardOnMobile";
}
+ var showTitle = options.showTitle == 'auto' ? true : options.showTitle;
+
if (options.autoThumb && item.ImageTags && item.ImageTags.Primary && item.PrimaryImageAspectRatio && item.PrimaryImageAspectRatio >= 1.5) {
width = posterWidth;
@@ -1664,37 +1706,38 @@
} else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") {
- if (item.Name && options.showTitle) {
+ if (item.Name && showTitle) {
icon = 'library-music';
}
cssClass += " defaultBackground";
} else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
- if (item.Name && options.showTitle) {
+ if (item.Name && showTitle) {
icon = 'folder-open';
}
cssClass += " defaultBackground";
} else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
- if (item.Name && options.showTitle) {
+ if (item.Name && showTitle) {
icon = 'videocam';
}
cssClass += " defaultBackground";
} else if (item.Type == "Person") {
- if (item.Name && options.showTitle) {
+ if (item.Name && showTitle) {
icon = 'person';
}
cssClass += " defaultBackground";
} else {
- if (item.Name && options.showTitle) {
+ if (item.Name && showTitle) {
icon = 'folder-open';
}
cssClass += " defaultBackground";
}
+ icon = item.icon || icon;
cssClass += ' ' + options.shape + 'Card';
var mediaSourceCount = item.MediaSourceCount || 1;
@@ -1705,7 +1748,7 @@
cssClass += ' groupedCard';
}
- if (options.showTitle && !options.overlayText) {
+ if (showTitle && !options.overlayText) {
cssClass += ' bottomPaddedCard';
}
@@ -1766,7 +1809,8 @@
}
var transition = options.transition === false || !AppInfo.enableSectionTransitions ? '' : ' data-transition="slide"';
- html += '
';
+ var onclick = item.onclick ? ' onclick="' + item.onclick + '"' : '';
+ html += '';
html += '';
if (icon) {
html += '
';
@@ -1791,18 +1835,18 @@
html += '
' + mediaSourceCount + '
';
}
if (item.IsUnidentified) {
- html += '
';
+ html += '
';
}
var progressHtml = options.showProgress === false || item.IsFolder ? '' : LibraryBrowser.getItemProgressBarHtml((item.Type == 'Recording' ? item : item.UserData));
var footerOverlayed = false;
- if (options.overlayText || (forceName && !options.showTitle)) {
+ if (options.overlayText || (forceName && !showTitle)) {
var footerCssClass = progressHtml ? 'cardFooter fullCardFooter' : 'cardFooter';
- html += LibraryBrowser.getCardFooterText(item, options, imgUrl, forceName, footerCssClass, progressHtml);
+ html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, footerCssClass, progressHtml);
footerOverlayed = true;
}
else if (progressHtml) {
@@ -1830,7 +1874,7 @@
html += '
';
if (!options.overlayText && !footerOverlayed) {
- html += LibraryBrowser.getCardFooterText(item, options, imgUrl, forceName, 'cardFooter outerCardFooter', progressHtml);
+ html += LibraryBrowser.getCardFooterText(item, options, showTitle, imgUrl, forceName, 'cardFooter outerCardFooter', progressHtml);
}
// cardBox
@@ -1842,7 +1886,7 @@
return html;
},
- getCardFooterText: function (item, options, imgUrl, forceName, footerClass, progressHtml) {
+ getCardFooterText: function (item, options, showTitle, imgUrl, forceName, footerClass, progressHtml) {
var html = '';
@@ -1854,9 +1898,9 @@
html += "";
}
- var name = LibraryBrowser.getPosterViewDisplayName(item, options.displayAsSpecial);
+ var name = options.showTitle == 'auto' && !item.IsFolder && item.MediaType == 'Photo' ? '' : LibraryBrowser.getPosterViewDisplayName(item, options.displayAsSpecial);
- if (!imgUrl && !options.showTitle) {
+ if (!imgUrl && !showTitle) {
html += "
";
html += htmlEncode(name);
html += "
";
@@ -1871,7 +1915,7 @@
lines.push(item.EpisodeTitle ? item.Name : (item.SeriesName || item.Album || item.AlbumArtist || item.GameSystem || ""));
}
- if (options.showTitle || forceName) {
+ if (showTitle || forceName) {
lines.push(htmlEncode(name));
}
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 44170e8428..1d436d4366 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -588,9 +588,9 @@
var html = '