diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index 90465a56ec..ef9cf55305 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -4,7 +4,7 @@
Emby
-
+
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 912bc7fb04..7a679c4db7 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -68,10 +68,17 @@
}
},
+ getSavedView: function (key) {
+
+ var val = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId() + '_view');
+
+ return val;
+ },
+
getSavedViewSetting: function (key) {
var deferred = $.Deferred();
- var val = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId() + '_view');
+ var val = LibraryBrowser.getSavedView(key);
deferred.resolveWith(null, [val]);
return deferred.promise();
diff --git a/dashboard-ui/scripts/livetvstatus.js b/dashboard-ui/scripts/livetvstatus.js
index 251e71572d..fabbbd7a69 100644
--- a/dashboard-ui/scripts/livetvstatus.js
+++ b/dashboard-ui/scripts/livetvstatus.js
@@ -395,10 +395,10 @@
// id: 'SchedulesDirect'
//});
- menuItems.push({
- name: 'Emby Guide',
- id: 'emby'
- });
+ //menuItems.push({
+ // name: 'Emby Guide',
+ // id: 'emby'
+ //});
require(['actionsheet'], function () {
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index d2a2be0894..a92b160a0d 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -1,10 +1,7 @@
(function ($, document) {
- var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
-
var data = {};
- function getQuery() {
-
+ function getPageData() {
var key = getSavedQueryKey();
var pageData = data[key];
@@ -20,13 +17,19 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize()
- }
+ },
+ view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
};
- //pageData.query.ParentId = LibraryMenu.getTopParentId();
+ pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
- return pageData.query;
+ return pageData;
+ }
+
+ function getQuery() {
+
+ return getPageData().query;
}
function getSavedQueryKey() {
@@ -67,6 +70,7 @@
if (result.TotalRecordCount) {
+ var view = getPageData().view;
var context = getParameterByName('context');
if (view == "List") {
@@ -179,7 +183,7 @@
}).checkboxradio('refresh');
- $('select.selectView', viewPanel).val(view).selectmenu('refresh');
+ $('select.selectView', viewPanel).val(getPageData().view).selectmenu('refresh');
$('.chkTrailer', viewPanel).checked(query.HasTrailer == true).checkboxradio('refresh');
$('.chkThemeSong', viewPanel).checked(query.HasThemeSong == true).checkboxradio('refresh');
@@ -249,11 +253,12 @@
$('select.selectView', viewPanel).on('change', function () {
- view = this.value;
+ var newView = this.value;
+ getPageData().view = newView;
reloadItems(tabContent, viewPanel);
- LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
+ LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
});
$('select.selectPageSize', viewPanel).on('change', function () {
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index e08ba6ab95..ccc5dd71cf 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -1,10 +1,7 @@
(function ($, document) {
- var view = LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb');
-
var data = {};
- function getQuery() {
-
+ function getPageData() {
var key = getSavedQueryKey();
var pageData = data[key];
@@ -18,13 +15,19 @@
Fields: "DateCreated,SyncInfo,ItemCounts",
StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize()
- }
+ },
+ view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Thumb', 'Thumb')
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
- return pageData.query;
+ return pageData;
+ }
+
+ function getQuery() {
+
+ return getPageData().query;
}
function getSavedQueryKey() {
@@ -55,6 +58,7 @@
})).trigger('create');
updateFilterControls(page);
+ var view = getPageData().view;
if (view == "Thumb") {
html = LibraryBrowser.getPosterViewHtml({
@@ -126,7 +130,7 @@
var query = getQuery();
$('select.selectPageSize', page).val(query.Limit).selectmenu('refresh');
- $('select.selectView', page).val(view).selectmenu('refresh');
+ $('select.selectView', page).val(getPageData().view).selectmenu('refresh');
}
function initPage(tabContent, viewPanel) {
@@ -158,10 +162,11 @@
$('select.selectView', viewPanel).on('change', function () {
- view = this.value;
+ var newView = this.value;
+ getPageData().view = newView;
reloadItems(tabContent, viewPanel);
- LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
+ LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
});
}
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index b0e578d45d..4dbed508b1 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -1,11 +1,8 @@
(function ($, document) {
- var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
-
var data = {};
- function getQuery() {
-
+ function getPageData() {
var key = getSavedQueryKey();
var pageData = data[key];
@@ -21,13 +18,19 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
StartIndex: 0,
Limit: LibraryBrowser.getDefaultPageSize()
- }
+ },
+ view: LibraryBrowser.getSavedView(key) || LibraryBrowser.getDefaultItemsView('Poster', 'Poster')
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
- return pageData.query;
+ return pageData;
+ }
+
+ function getQuery() {
+
+ return getPageData().query;
}
function getSavedQueryKey() {
@@ -42,6 +45,7 @@
var userId = Dashboard.getCurrentUserId();
var query = getQuery();
+ var view = getPageData().view;
ApiClient.getItems(userId, query).done(function (result) {
@@ -208,7 +212,7 @@
}).checkboxradio('refresh');
- $('select.selectView', viewPanel).val(view).selectmenu('refresh');
+ $('select.selectView', viewPanel).val(getPageData().view).selectmenu('refresh');
$('.chk3D', viewPanel).checked(query.Is3D == true).checkboxradio('refresh');
$('.chkHD', viewPanel).checked(query.IsHD == true).checkboxradio('refresh');
@@ -280,10 +284,11 @@
$('select.selectView', viewPanel).on('change', function () {
- view = this.value;
+ var newView = this.value;
+ getPageData().view = newView;
var query = getQuery();
- if (view == "Timeline") {
+ if (newView == "Timeline") {
query.SortBy = "PremiereDate";
query.SortOrder = "Descending";
@@ -294,7 +299,7 @@
reloadItems(tabContent, viewPanel);
}
- LibraryBrowser.saveViewSetting(getSavedQueryKey(), view);
+ LibraryBrowser.saveViewSetting(getSavedQueryKey(), newView);
});
$('.chkVideoTypeFilter', viewPanel).on('change', function () {
@@ -453,6 +458,7 @@
}
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 81730bca3b..d925d87bdd 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -68,6 +68,7 @@
}
$('#recentlyAddedItems', page).html(html).lazyChildren();
+ LibraryBrowser.setLastRefreshed(page);
});
}