From 80929558e634d27c92d9cb18b7a5c15643483e1e Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 15 Oct 2015 00:32:10 -0400
Subject: [PATCH] enable back button on sort menus

---
 .../components/playlisteditor/playlisteditor.js       |  2 +-
 dashboard-ui/reports.html                             |  6 +++---
 dashboard-ui/scripts/channelitems.js                  |  2 +-
 dashboard-ui/scripts/episodes.js                      |  2 +-
 dashboard-ui/scripts/gamegenrepage.js                 |  2 +-
 dashboard-ui/scripts/gamespage.js                     |  2 +-
 dashboard-ui/scripts/gamestudiospage.js               |  2 +-
 dashboard-ui/scripts/gamesystemspage.js               |  2 +-
 dashboard-ui/scripts/itemlistpage.js                  |  2 +-
 dashboard-ui/scripts/librarybrowser.js                |  8 ++++++--
 dashboard-ui/scripts/librarylist.js                   | 11 ++++++++---
 dashboard-ui/scripts/livetvchannels.js                |  2 +-
 dashboard-ui/scripts/livetvitems.js                   |  2 +-
 dashboard-ui/scripts/moviecollections.js              |  2 +-
 dashboard-ui/scripts/moviegenres.js                   |  2 +-
 dashboard-ui/scripts/movies.js                        |  2 +-
 dashboard-ui/scripts/moviestudios.js                  |  2 +-
 dashboard-ui/scripts/movietrailers.js                 |  2 +-
 dashboard-ui/scripts/musicalbumartists.js             |  2 +-
 dashboard-ui/scripts/musicalbums.js                   |  2 +-
 dashboard-ui/scripts/musicartists.js                  |  2 +-
 dashboard-ui/scripts/musicgenres.js                   |  2 +-
 dashboard-ui/scripts/photos.js                        |  2 +-
 dashboard-ui/scripts/playlistedit.js                  |  2 +-
 dashboard-ui/scripts/playlists.js                     |  2 +-
 dashboard-ui/scripts/reports.js                       | 10 ++++++++++
 dashboard-ui/scripts/secondaryitems.js                |  2 +-
 dashboard-ui/scripts/songs.js                         |  2 +-
 dashboard-ui/scripts/tvgenres.js                      |  2 +-
 dashboard-ui/scripts/tvshows.js                       |  2 +-
 dashboard-ui/scripts/tvstudios.js                     |  2 +-
 31 files changed, 54 insertions(+), 35 deletions(-)

diff --git a/dashboard-ui/components/playlisteditor/playlisteditor.js b/dashboard-ui/components/playlisteditor/playlisteditor.js
index ee8ee270bb..74a901e370 100644
--- a/dashboard-ui/components/playlisteditor/playlisteditor.js
+++ b/dashboard-ui/components/playlisteditor/playlisteditor.js
@@ -117,7 +117,7 @@
                 return '<option value="' + i.Id + '">' + i.Name + '</option>';
             });
 
-            select.html(html).val('').trigger('change');
+            select.html(html).val(lastPlaylistId || '').trigger('change');
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html
index 81751fef25..23324352e1 100644
--- a/dashboard-ui/reports.html
+++ b/dashboard-ui/reports.html
@@ -43,10 +43,10 @@
             <div class="listBottomPaging">
             </div>
 
-            <div data-role="panel" id="viewPanel" class="viewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
+            <div data-role="panel" id="viewPanel" class="viewPanel" data-theme="b" data-position="right" data-display="overlay" data-position-fixed="true">
                 <form>
                     <div data-role="controlgroup" data-type="horizontal" data-mini="true" class="viewPanelTabs">
-                        <a href="#" id="tabView" data-role="button" class="viewTabButton" data-tab="tabView">${TabView}</a>
+                        <a href="#" id="tabView" data-role="button" class="viewTabButton ui-btn-active" data-tab="tabView">${TabView}</a>
                         <a href="#" id="tabFilter" data-role="button" class="viewTabButton" data-tab="tabFilter">${TabFilter}</a>
                     </div>
 
@@ -89,7 +89,7 @@
                         </div>
                     </div>
 
-                    <div class="tabFilter viewTab" id="tabFilterBox">
+                    <div class="tabFilter viewTab hide" id="tabFilterBox">
                         <fieldset data-role="controlgroup">
                             <legend>
                                 ${HeaderFilters}
diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js
index 6571c63822..e83f8b9ed1 100644
--- a/dashboard-ui/scripts/channelitems.js
+++ b/dashboard-ui/scripts/channelitems.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'movies';
+        return LibraryBrowser.getSavedQueryKey('movies');
     }
 
     function reloadFeatures(page) {
diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js
index 50756169fe..b11641f931 100644
--- a/dashboard-ui/scripts/episodes.js
+++ b/dashboard-ui/scripts/episodes.js
@@ -37,7 +37,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'episodes';
+        return LibraryBrowser.getSavedQueryKey('episodes');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js
index d7f5cc372c..01462c6067 100644
--- a/dashboard-ui/scripts/gamegenrepage.js
+++ b/dashboard-ui/scripts/gamegenrepage.js
@@ -12,7 +12,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamegenres' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js
index 157c2d0855..40b1d74eef 100644
--- a/dashboard-ui/scripts/gamespage.js
+++ b/dashboard-ui/scripts/gamespage.js
@@ -18,7 +18,7 @@
 
     function getSavedQueryKey() {
 
-        return 'games' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js
index 4f068a3c86..933b62e727 100644
--- a/dashboard-ui/scripts/gamestudiospage.js
+++ b/dashboard-ui/scripts/gamestudiospage.js
@@ -13,7 +13,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamestudios' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/gamesystemspage.js b/dashboard-ui/scripts/gamesystemspage.js
index b1268779d3..8e753ad606 100644
--- a/dashboard-ui/scripts/gamesystemspage.js
+++ b/dashboard-ui/scripts/gamesystemspage.js
@@ -15,7 +15,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamesystems' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js
index d05b7b9388..e2f491ce92 100644
--- a/dashboard-ui/scripts/itemlistpage.js
+++ b/dashboard-ui/scripts/itemlistpage.js
@@ -39,7 +39,7 @@
     }
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5f814b44c0..4b4b78904e 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -25,6 +25,11 @@
 
         },
 
+        getSavedQueryKey: function (modifier) {
+
+            return getWindowUrl().split('#')[0] + (modifier || '');
+        },
+
         loadSavedQueryValues: function (key, query) {
 
             var values = appStorage.getItem(key + '_' + Dashboard.getCurrentUserId());
@@ -2793,8 +2798,7 @@
 
             require(['components/paperdialoghelper'], function () {
 
-                //PaperDialogHelper.openWithHash(dlg, 'sortmenu');
-                dlg.open();
+                PaperDialogHelper.openWithHash(dlg, 'sortmenu');
 
                 $('.groupSortBy', dlg).on('iron-select', function () {
                     options.query.SortBy = this.selected.replace('_', ',');
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index c41bfe84cf..1fa95a2f32 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -1024,12 +1024,17 @@
 
     function showTapHoldHelp() {
 
-        // Don't do this on the home page
-        if (!$.mobile.activePage || $($.mobile.activePage)[0].classList.contains('homePage')) {
+        if (!$.mobile.activePage) {
             return;
         }
 
-        var expectedValue = "5";
+        var page = $($.mobile.activePage)[0];
+        // Don't do this on the home page
+        if (page.classList.contains('homePage') || page.classList.contains('itemDetailPage')) {
+            return;
+        }
+
+        var expectedValue = "6";
         if (appStorage.getItem("tapholdhelp") == expectedValue) {
             return;
         }
diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js
index e72ee8d849..14f56fa248 100644
--- a/dashboard-ui/scripts/livetvchannels.js
+++ b/dashboard-ui/scripts/livetvchannels.js
@@ -27,7 +27,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'channels';
+        return LibraryBrowser.getSavedQueryKey('channels');
     }
 
     function getChannelsHtml(channels) {
diff --git a/dashboard-ui/scripts/livetvitems.js b/dashboard-ui/scripts/livetvitems.js
index 194bb7debf..df28007321 100644
--- a/dashboard-ui/scripts/livetvitems.js
+++ b/dashboard-ui/scripts/livetvitems.js
@@ -15,7 +15,7 @@
     };
 
     function getSavedQueryKey() {
-        return 'livetvitems2' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js
index 287d378055..54c97e45ff 100644
--- a/dashboard-ui/scripts/moviecollections.js
+++ b/dashboard-ui/scripts/moviecollections.js
@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'collections';
+        return LibraryBrowser.getSavedQueryKey('collections');
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js
index e797632ef1..97efe44f64 100644
--- a/dashboard-ui/scripts/moviegenres.js
+++ b/dashboard-ui/scripts/moviegenres.js
@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js
index 9a2a7977b1..fe640e6fcb 100644
--- a/dashboard-ui/scripts/movies.js
+++ b/dashboard-ui/scripts/movies.js
@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'movies';
+        return LibraryBrowser.getSavedQueryKey('movies');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js
index 4e462d5533..c4625c65d6 100644
--- a/dashboard-ui/scripts/moviestudios.js
+++ b/dashboard-ui/scripts/moviestudios.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'studios'
+        return LibraryBrowser.getSavedQueryKey('studios');
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 5480906952..a5364cb9cf 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'trailers';
+        return LibraryBrowser.getSavedQueryKey('trailers');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js
index bac1af2ccc..df0bd070e4 100644
--- a/dashboard-ui/scripts/musicalbumartists.js
+++ b/dashboard-ui/scripts/musicalbumartists.js
@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'albumartists';
+        return LibraryBrowser.getSavedQueryKey('albumartists');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js
index 26ae9160f9..61b0d8ce9d 100644
--- a/dashboard-ui/scripts/musicalbums.js
+++ b/dashboard-ui/scripts/musicalbums.js
@@ -34,7 +34,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'albums';
+        return LibraryBrowser.getSavedQueryKey('albums');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js
index 4c897bd2dd..d92612d59c 100644
--- a/dashboard-ui/scripts/musicartists.js
+++ b/dashboard-ui/scripts/musicartists.js
@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'artists';
+        return LibraryBrowser.getSavedQueryKey('artists');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js
index 750de78b03..43c4deac20 100644
--- a/dashboard-ui/scripts/musicgenres.js
+++ b/dashboard-ui/scripts/musicgenres.js
@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index 6c69319432..4222cc3b67 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey(tab) {
 
-        return getWindowUrl() + "&tab=" + tab;
+        return LibraryBrowser.getSavedQueryKey('tab=' + tab);
     }
 
     function reloadItems(page, tabIndex) {
diff --git a/dashboard-ui/scripts/playlistedit.js b/dashboard-ui/scripts/playlistedit.js
index 136a679d44..cb1b32433c 100644
--- a/dashboard-ui/scripts/playlistedit.js
+++ b/dashboard-ui/scripts/playlistedit.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
 
diff --git a/dashboard-ui/scripts/playlists.js b/dashboard-ui/scripts/playlists.js
index d427c982f3..96fd453502 100644
--- a/dashboard-ui/scripts/playlists.js
+++ b/dashboard-ui/scripts/playlists.js
@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function showLoadingMessage(page) {
diff --git a/dashboard-ui/scripts/reports.js b/dashboard-ui/scripts/reports.js
index a685a31e8e..a8a7fcafe2 100644
--- a/dashboard-ui/scripts/reports.js
+++ b/dashboard-ui/scripts/reports.js
@@ -829,6 +829,16 @@
             query.StartIndex = 0;
             reloadItems(page);
         });
+
+        $(page.getElementsByClassName('viewTabButton')).on('click', function () {
+
+            var parent = $(this).parents('.viewPanel');
+            $('.viewTabButton', parent).removeClass('ui-btn-active');
+            this.classList.add('ui-btn-active');
+
+            $('.viewTab', parent).addClass('hide');
+            $('.' + this.getAttribute('data-tab'), parent).removeClass('hide');
+        });
     })
 	.on('pageshow', "#libraryReportManagerPage", function () {
 
diff --git a/dashboard-ui/scripts/secondaryitems.js b/dashboard-ui/scripts/secondaryitems.js
index 9a5a9b9d87..e923aa62f3 100644
--- a/dashboard-ui/scripts/secondaryitems.js
+++ b/dashboard-ui/scripts/secondaryitems.js
@@ -66,7 +66,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function onListItemClick(e) {
diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js
index ffc7180db5..5e5c1c57b1 100644
--- a/dashboard-ui/scripts/songs.js
+++ b/dashboard-ui/scripts/songs.js
@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'songs';
+        return LibraryBrowser.getSavedQueryKey('songs');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js
index 18ba49797d..a352a166c4 100644
--- a/dashboard-ui/scripts/tvgenres.js
+++ b/dashboard-ui/scripts/tvgenres.js
@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {
diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js
index 194e2335da..9b88c5e222 100644
--- a/dashboard-ui/scripts/tvshows.js
+++ b/dashboard-ui/scripts/tvshows.js
@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'series';
+        return LibraryBrowser.getSavedQueryKey('series');
     }
 
     function reloadItems(page, viewPanel) {
diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js
index 38a11366f4..116920178c 100644
--- a/dashboard-ui/scripts/tvstudios.js
+++ b/dashboard-ui/scripts/tvstudios.js
@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'studios'
+        return LibraryBrowser.getSavedQueryKey('studios');
     }
 
     function reloadItems(page) {