What the Critics Say
diff --git a/dashboard-ui/itemgallery.html b/dashboard-ui/itemgallery.html
new file mode 100644
index 000000000..8b667b14f
--- /dev/null
+++ b/dashboard-ui/itemgallery.html
@@ -0,0 +1,25 @@
+
+
+
+ Media Browser
+
+
+ ![](" + url + ")
";
+ if (item.Type == "Person" || item.Type == "Genre" || item.Type == "Studio" || item.Type == "Artist") {
+ identifierName = item.Type;
+ identifierValue = ApiClient.encodeName(item.Name);
}
+ var href = "itemgallery.html?" + identifierName + "=" + identifierValue;
+
+ html += "";
+
return html;
},
@@ -1512,6 +1519,11 @@
var imageTags = item.ImageTags || {};
+ if (imageTags.Primary) {
+
+ return true;
+ }
+
if (imageTags.Banner) {
return true;
@@ -1567,6 +1579,11 @@
var imageTags = item.ImageTags || {};
+ if (imageTags.Primary) {
+
+ html += LibraryBrowser.createGalleryImage(item, "Primary", imageTags.Primary);
+ }
+
if (imageTags.Banner) {
html += LibraryBrowser.createGalleryImage(item, "Banner", imageTags.Banner);
+
+
+
+
diff --git a/dashboard-ui/scripts/Itemdetailpage.js b/dashboard-ui/scripts/Itemdetailpage.js
index 6b7f4d4a5..769846018 100644
--- a/dashboard-ui/scripts/Itemdetailpage.js
+++ b/dashboard-ui/scripts/Itemdetailpage.js
@@ -119,12 +119,6 @@
else {
$('#childrenCollapsible', page).addClass('hide');
}
- if (LibraryBrowser.shouldDisplayGallery(item)) {
- $('#galleryCollapsible', page).show();
- renderGallery(page, item);
- } else {
- $('#galleryCollapsible', page).hide();
- }
if (item.MediaStreams && item.MediaStreams.length) {
renderMediaInfo(page, item);
@@ -607,13 +601,6 @@
$('#scenesContent', page).html(html).trigger('create');
}
- function renderGallery(page, item) {
-
- var html = LibraryBrowser.getGalleryHtml(item);
-
- $('#galleryContent', page).html(html).trigger('create');
- }
-
function renderMediaInfo(page, item) {
var html = '';
diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js
index 25790672b..af154e2b4 100644
--- a/dashboard-ui/scripts/extensions.js
+++ b/dashboard-ui/scripts/extensions.js
@@ -199,7 +199,7 @@ function humane_elapsed(firstDateStr, secondDateStr) {
function getParameterByName(name, url) {
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
var regexS = "[\\?&]" + name + "=([^&#]*)";
- var regex = new RegExp(regexS);
+ var regex = new RegExp(regexS, "i");
var results = regex.exec(url || window.location.search);
if (results == null)
return "";
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 4efb47508..d7747e053 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -3,46 +3,43 @@
var currentItem;
var shape;
- function reload(page) {
-
- Dashboard.showLoadingMsg();
-
- var getItemPromise;
+ function getPromise() {
var name = getParameterByName('person');
if (name) {
- getItemPromise = ApiClient.getPerson(name, Dashboard.getCurrentUserId());
- } else {
-
- name = getParameterByName('studio');
-
- if (name) {
-
- getItemPromise = ApiClient.getStudio(name, Dashboard.getCurrentUserId());
-
- } else {
-
- name = getParameterByName('genre');
-
- if (name) {
- getItemPromise = ApiClient.getGenre(name, Dashboard.getCurrentUserId());
- }
- else {
-
- name = getParameterByName('artist');
-
- if (name) {
- getItemPromise = ApiClient.getArtist(name, Dashboard.getCurrentUserId());
- }
- else {
- throw new Error('Invalid request');
- }
- }
- }
+ return ApiClient.getPerson(name, Dashboard.getCurrentUserId());
}
- getItemPromise.done(function (item) {
+ name = getParameterByName('studio');
+
+ if (name) {
+
+ return ApiClient.getStudio(name, Dashboard.getCurrentUserId());
+
+ }
+
+ name = getParameterByName('genre');
+
+ if (name) {
+ return ApiClient.getGenre(name, Dashboard.getCurrentUserId());
+ }
+
+ name = getParameterByName('artist');
+
+ if (name) {
+ return ApiClient.getArtist(name, Dashboard.getCurrentUserId());
+ }
+ else {
+ throw new Error('Invalid request');
+ }
+ }
+
+ function reload(page) {
+
+ Dashboard.showLoadingMsg();
+
+ getPromise().done(function (item) {
currentItem = item;
@@ -204,13 +201,6 @@
});
}
- function renderGallery(page, item) {
-
- var html = LibraryBrowser.getGalleryHtml(item);
-
- $('#galleryContent', page).html(html).trigger('create');
- }
-
function bindRadioEvents(page) {
$("#radioMusicVideos", page).on("click", function () {
@@ -311,13 +301,6 @@
renderUserDataIcons(page, item);
LibraryBrowser.renderLinks($('#itemLinks', page), item);
- if (LibraryBrowser.shouldDisplayGallery(item)) {
- $('#galleryCollapsible', page).show();
- renderGallery(page, item);
- } else {
- $('#galleryCollapsible', page).hide();
- }
-
if (item.Type == "Person" && item.PremiereDate) {
try {
diff --git a/dashboard-ui/scripts/itemgallery.js b/dashboard-ui/scripts/itemgallery.js
new file mode 100644
index 000000000..a0da675ae
--- /dev/null
+++ b/dashboard-ui/scripts/itemgallery.js
@@ -0,0 +1,66 @@
+(function ($, document) {
+
+ var currentItem;
+
+ function getPromise() {
+
+ var name = getParameterByName('person');
+
+ if (name) {
+ return ApiClient.getPerson(name, Dashboard.getCurrentUserId());
+ }
+
+ name = getParameterByName('studio');
+
+ if (name) {
+
+ return ApiClient.getStudio(name, Dashboard.getCurrentUserId());
+
+ }
+
+ name = getParameterByName('genre');
+
+ if (name) {
+ return ApiClient.getGenre(name, Dashboard.getCurrentUserId());
+ }
+
+ name = getParameterByName('artist');
+
+ if (name) {
+ return ApiClient.getArtist(name, Dashboard.getCurrentUserId());
+ }
+
+ return ApiClient.getItem(Dashboard.getCurrentUserId(), getParameterByName('id'));
+ }
+
+ function reload(page) {
+
+ Dashboard.showLoadingMsg();
+
+ getPromise().done(function (item) {
+
+ currentItem = item;
+
+ LibraryBrowser.renderName(item, $('.itemName', page), true);
+ LibraryBrowser.renderParentName(item, $('.parentName', page));
+
+ $('#galleryContent', page).html(LibraryBrowser.getGalleryHtml(currentItem)).trigger('create');
+
+ Dashboard.hideLoadingMsg();
+ });
+ }
+
+ $(document).on('pageshow', "#itemGalleryPage", function () {
+
+ var page = this;
+
+ reload(page);
+
+ }).on('pagehide', "#itemGalleryPage", function () {
+
+ var page = this;
+
+ currentItem = null;
+ });
+
+})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 7cb6d0c6c..48ac602f7 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1279,11 +1279,18 @@
url = "css/images/items/detail/video.png";
}
- if (url) {
+ var identifierName = "id";
+ var identifierValue = item.Id;
- html += "
+
+
+
+
+
+
+
+
+
+ Gallery
+
+
+