diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 4cabf8f9a1..62bfb28e0e 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -24,17 +24,6 @@
-
${TabAlbums}
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/movies.html
similarity index 97%
rename from dashboard-ui/moviesrecommended.html
rename to dashboard-ui/movies.html
index 71716cbf5d..90465a56ec 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/movies.html
@@ -17,13 +17,13 @@
${TabStudios}
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 3c6b1a6eb0..2f0bc40d75 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -259,20 +259,6 @@
$('.lnkPhotoAlbums', page).addClass('ui-btn-active');
}
}
- else if (context == 'movies' || context == 'movies-trailers') {
- elem = $('#movieTabs', page).show();
- $('a', elem).removeClass('ui-btn-active');
-
- if (item.Type == 'BoxSet') {
- $('.lnkCollections', page).addClass('ui-btn-active');
- }
- else if (context == 'movies-trailers') {
- $('.lnkMovieTrailers', page).addClass('ui-btn-active');
- }
- else {
- $('.lnkMovies', page).addClass('ui-btn-active');
- }
- }
else if (context == 'tv') {
elem = $('#tvShowsTabs', page).show();
}
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 13789ba5b6..912bc7fb04 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -755,7 +755,7 @@
if (context != 'folders') {
if (item.CollectionType == 'movies') {
- return 'moviesrecommended.html?topParentId=' + item.Id;
+ return 'movies.html?topParentId=' + item.Id;
}
if (item.CollectionType == 'boxsets') {
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 1bc5ce3337..d2a2be0894 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -188,7 +188,7 @@
$('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh');
}
- function initEvents(tabContent, viewPanel) {
+ function initPage(tabContent, viewPanel) {
$('.radioSortBy', viewPanel).on('click', function () {
var query = getQuery();
@@ -274,14 +274,17 @@
$(page.querySelector('neon-animated-pages')).on('tabchange', function () {
if (parseInt(this.selected) == index) {
+ if (!tabContent.initComplete) {
+ initPage(tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+
if (LibraryBrowser.needsRefresh(tabContent)) {
reloadItems(tabContent, viewPanel);
updateFilterControls(viewPanel);
}
}
});
-
- initEvents(tabContent, viewPanel);
});
$(document).on('pageinitdepends', "#boxsetsPage", function () {
@@ -291,7 +294,7 @@
var content = page;
var viewPanel = page.querySelector('.viewPanel');
- initEvents(content, viewPanel);
+ initPage(content, viewPanel);
}).on('pagebeforeshowready', "#boxsetsPage", function () {
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index 7cfd27800e..e08ba6ab95 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -129,22 +129,7 @@
$('select.selectView', page).val(view).selectmenu('refresh');
}
- $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
-
- var page = this;
- var index = 4;
- var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
- var viewPanel = $('.genreViewPanel', page);
-
- $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
-
- if (parseInt(this.selected) == index) {
- if (LibraryBrowser.needsRefresh(tabContent)) {
- reloadItems(tabContent, viewPanel);
- updateFilterControls(viewPanel);
- }
- }
- });
+ function initPage(tabContent, viewPanel) {
$('.chkStandardFilter', viewPanel).on('change', function () {
@@ -178,6 +163,31 @@
reloadItems(tabContent, viewPanel);
LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
});
+ }
+
+ $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
+
+ var page = this;
+ var index = 4;
+ var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
+ var viewPanel = $('.genreViewPanel', page);
+
+ $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
+
+ if (parseInt(this.selected) == index) {
+
+ if (!tabContent.initComplete) {
+ initPage(tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ reloadItems(tabContent, viewPanel);
+ updateFilterControls(viewPanel);
+ }
+ }
+ });
+
});
diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js
index bd9bcde10c..0039505a68 100644
--- a/dashboard-ui/scripts/moviepeople.js
+++ b/dashboard-ui/scripts/moviepeople.js
@@ -104,23 +104,7 @@
$('.alphabetPicker', tabContent).alphaValue(query.NameStartsWithOrGreater);
}
- $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
-
- var page = this;
- var index = 5;
- var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
- var viewPanel = $('.peopleViewPanel', page);
-
- $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
-
- if (parseInt(this.selected) == index) {
-
- if (LibraryBrowser.needsRefresh(tabContent)) {
- reloadItems(tabContent, viewPanel);
- updateFilterControls(tabContent, viewPanel);
- }
- }
- });
+ function initPage(tabContent, viewPanel) {
$('.chkStandardFilter', viewPanel).on('change', function () {
@@ -173,7 +157,29 @@
reloadItems(tabContent, viewPanel);
});
+ }
+ $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
+
+ var page = this;
+ var index = 5;
+ var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
+ var viewPanel = $('.peopleViewPanel', page);
+
+ $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
+
+ if (parseInt(this.selected) == index) {
+
+ if (!tabContent.initComplete) {
+ initPage(tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ reloadItems(tabContent, viewPanel);
+ updateFilterControls(tabContent, viewPanel);
+ }
+ }
+ });
});
})(jQuery, document);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index caadc2ff96..b0e578d45d 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -239,22 +239,7 @@
}
}
- $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
-
- var page = this;
- var index = 1;
- var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
- var viewPanel = $('.movieViewPanel', page);
-
- $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
-
- if (parseInt(this.selected) == index) {
- if (LibraryBrowser.needsRefresh(tabContent)) {
- reloadItems(tabContent, viewPanel);
- updateFilterControls(tabContent, viewPanel);
- }
- }
- });
+ function initPage(tabContent, viewPanel) {
$(viewPanel).on('panelopen', function () {
@@ -303,7 +288,7 @@
query.SortBy = "PremiereDate";
query.SortOrder = "Descending";
query.StartIndex = 0;
- $('.radioPremiereDate', page)[0].click();
+ $('.radioPremiereDate', viewPanel)[0].click();
} else {
reloadItems(tabContent, viewPanel);
@@ -450,6 +435,30 @@
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
});
+ }
+
+ $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
+
+ var page = this;
+ var index = 1;
+ var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
+ var viewPanel = $('.movieViewPanel', page);
+
+ $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
+
+ if (parseInt(this.selected) == index) {
+ if (!tabContent.initComplete) {
+ initPage(tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ reloadItems(tabContent, viewPanel);
+ updateFilterControls(tabContent, viewPanel);
+ }
+ }
+ });
+
});
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index d3c0a7f445..81730bca3b 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -284,9 +284,9 @@
if (LibraryBrowser.navigateOnLibraryTabSelect()) {
if (selected) {
- Dashboard.navigate('moviesrecommended.html?tab=' + selected);
+ Dashboard.navigate('movies.html?tab=' + selected);
} else {
- Dashboard.navigate('moviesrecommended.html');
+ Dashboard.navigate('movies.html');
}
} else {
diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js
index 9d617c01cc..16d2c871b8 100644
--- a/dashboard-ui/scripts/moviestudios.js
+++ b/dashboard-ui/scripts/moviestudios.js
@@ -92,22 +92,7 @@
$('select.selectPageSize', page).val(query.Limit).selectmenu('refresh');
}
- $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
-
- var page = this;
- var index = 6;
- var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
- var viewPanel = $('.studioViewPanel', page);
-
- $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
-
- if (parseInt(this.selected) == index) {
- if (LibraryBrowser.needsRefresh(tabContent)) {
- reloadItems(tabContent, viewPanel);
- updateFilterControls(viewPanel);
- }
- }
- });
+ function initPage(tabContent, viewPanel) {
$('.chkStandardFilter', viewPanel).on('change', function () {
@@ -133,6 +118,31 @@
query.StartIndex = 0;
reloadItems(tabContent, viewPanel);
});
+ }
+
+ $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
+
+ var page = this;
+ var index = 6;
+ var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
+ var viewPanel = $('.studioViewPanel', page);
+
+ $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
+
+ if (parseInt(this.selected) == index) {
+
+ if (!tabContent.initComplete) {
+ initPage(tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ reloadItems(tabContent, viewPanel);
+ updateFilterControls(viewPanel);
+ }
+ }
+ });
+
});
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index e140678ae5..37494da875 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -160,22 +160,7 @@
return false;
}
- $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
-
- var page = this;
- var index = 2;
- var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
- var viewPanel = $('.trailerViewPanel', page);
-
- $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
-
- if (parseInt(this.selected) == index) {
- if (LibraryBrowser.needsRefresh(tabContent)) {
- reloadItems(tabContent, viewPanel);
- updateFilterControls(tabContent, viewPanel);
- }
- }
- });
+ function initPage(page, tabContent, viewPanel) {
$('.radioSortBy', viewPanel).on('click', function () {
var query = getQuery();
@@ -245,6 +230,31 @@
});
$('.popupTrailerReelForm', page).off('submit', onSubmit).on('submit', onSubmit);
+ }
+
+ $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
+
+ var page = this;
+ var index = 2;
+ var tabContent = page.querySelector('.pageTabContent[data-index=\'' + index + '\']');
+ var viewPanel = $('.trailerViewPanel', page);
+
+ $(page.querySelector('neon-animated-pages')).on('tabchange', function () {
+
+ if (parseInt(this.selected) == index) {
+
+ if (!tabContent.initComplete) {
+ initPage(page, tabContent, viewPanel);
+ tabContent.initComplete = true;
+ }
+
+ if (LibraryBrowser.needsRefresh(tabContent)) {
+ reloadItems(tabContent, viewPanel);
+ updateFilterControls(tabContent, viewPanel);
+ }
+ }
+ });
+
});
})(jQuery, document);
\ No newline at end of file