3.0.5666.2

dashboard-ui/scripts/musicalbumartists.js

@@ -4,27 +4,44 @@
 
     var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
 
-    // The base query options
-    var query = {
+    var data = {};
 
-        SortBy: "SortName",
-        SortOrder: "Ascending",
-        Recursive: true,
-        Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
-        StartIndex: 0,
-        ImageTypeLimit: 1,
-        EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
-    };
+    function getQuery() {
+
+        var key = getSavedQueryKey();
+        var pageData = data[key];
+
+        if (!pageData) {
+            pageData = data[key] = {
+                query: {
+                    SortBy: "SortName",
+                    SortOrder: "Ascending",
+                    Recursive: true,
+                    Fields: "PrimaryImageAspectRatio,SortName,DateCreated,SyncInfo,ItemCounts",
+                    StartIndex: 0,
+                    ImageTypeLimit: 1,
+                    EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
+                    Limit: LibraryBrowser.getDefaultPageSize()
+                }
+            };
+
+            pageData.query.ParentId = LibraryMenu.getTopParentId();
+            LibraryBrowser.loadSavedQueryValues(key, pageData.query);
+        }
+        return pageData.query;
+    }
 
     function getSavedQueryKey() {
 
-        return 'musicartists' + (query.ParentId || '');
+        return getWindowUrl();
     }
 
     function reloadItems(page) {
 
         Dashboard.showLoadingMsg();
 
+        var query = getQuery();
+
         ApiClient.getAlbumArtists(Dashboard.getCurrentUserId(), query).done(function (result) {
 
             // Scroll back up so they can see the results from the beginning
@@ -100,13 +117,15 @@
             });
 
             LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
-
+            LibraryBrowser.setLastRefreshed(page);
             Dashboard.hideLoadingMsg();
         });
     }
 
     function updateFilterControls(page) {
 
+        var query = getQuery();
+
         $('.chkStandardFilter', page).each(function () {
 
             var filters = "," + (query.Filters || "");
@@ -129,6 +148,8 @@
 
             filtersLoaded = true;
 
+            var query = getQuery();
+
             QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () {
 
                 reloadItems(page);
@@ -147,6 +168,8 @@
 
         $('.chkStandardFilter', this).on('change', function () {
 
+            var query = getQuery();
+
             var filterName = this.getAttribute('data-filter');
             var filters = query.Filters || "";
 
@@ -164,6 +187,8 @@
 
         $('.alphabetPicker', this).on('alphaselect', function (e, character) {
 
+            var query = getQuery();
+
             query.NameStartsWithOrGreater = character;
             query.StartIndex = 0;
 
@@ -171,6 +196,8 @@
 
         }).on('alphaclear', function (e) {
 
+            var query = getQuery();
+
             query.NameStartsWithOrGreater = '';
 
             reloadItems(page);
@@ -186,6 +213,8 @@
         });
 
         $('#selectPageSize', page).on('change', function () {
+            var query = getQuery();
+
             query.Limit = parseInt(this.value);
             query.StartIndex = 0;
             reloadItems(page);
@@ -194,29 +223,20 @@
     }).on('pagebeforeshowready', "#musicAlbumArtistsPage", function () {
 
         var page = this;
-        query.ParentId = LibraryMenu.getTopParentId();
+        var query = getQuery();
 
-        var limit = LibraryBrowser.getDefaultPageSize(pageSizeKey, 100);
-
-        // If the default page size has changed, the start index will have to be reset
-        if (limit != query.Limit) {
-            query.Limit = limit;
-            query.StartIndex = 0;
-        }
-
-        var viewkey = getSavedQueryKey();
-
-        LibraryBrowser.loadSavedQueryValues(viewkey, query);
         QueryFilters.onPageShow(page, query);
 
-        LibraryBrowser.getSavedViewSetting(viewkey).done(function (val) {
+        if (LibraryBrowser.needsRefresh(page)) {
+            LibraryBrowser.getSavedViewSetting(getSavedQueryKey()).done(function (val) {
 
-            if (val) {
-                $('#selectView', page).val(val).selectmenu('refresh').trigger('change');
-            } else {
-                reloadItems(page);
-            }
-        });
+                if (val) {
+                    $('#selectView', page).val(val).selectmenu('refresh').trigger('change');
+                } else {
+                    reloadItems(page);
+                }
+            });
+        }
 
         updateFilterControls(this);
     });