enable back button on sort menus

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();
         });

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}

dashboard-ui/scripts/channelitems.js

@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'movies';
+        return LibraryBrowser.getSavedQueryKey('movies');
     }
 
     function reloadFeatures(page) {

dashboard-ui/scripts/episodes.js

@@ -37,7 +37,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'episodes';
+        return LibraryBrowser.getSavedQueryKey('episodes');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/gamegenrepage.js

@@ -12,7 +12,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamegenres' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/gamespage.js

@@ -18,7 +18,7 @@
 
     function getSavedQueryKey() {
 
-        return 'games' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/gamestudiospage.js

@@ -13,7 +13,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamestudios' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/gamesystemspage.js

@@ -15,7 +15,7 @@
 
     function getSavedQueryKey() {
 
-        return 'gamesystems' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/itemlistpage.js

@@ -39,7 +39,7 @@
     }
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

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');
+                PaperDialogHelper.openWithHash(dlg, 'sortmenu');
-                dlg.open();
 
                 $('.groupSortBy', dlg).on('iron-select', function () {
                     options.query.SortBy = this.selected.replace('_', ',');

dashboard-ui/scripts/librarylist.js

@@ -1024,12 +1024,17 @@
 
     function showTapHoldHelp() {
 
-        // Don't do this on the home page
+        if (!$.mobile.activePage) {
-        if (!$.mobile.activePage || $($.mobile.activePage)[0].classList.contains('homePage')) {
             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;
         }

dashboard-ui/scripts/livetvchannels.js

@@ -27,7 +27,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'channels';
+        return LibraryBrowser.getSavedQueryKey('channels');
     }
 
     function getChannelsHtml(channels) {

dashboard-ui/scripts/livetvitems.js

@@ -15,7 +15,7 @@
     };
 
     function getSavedQueryKey() {
-        return 'livetvitems2' + (query.ParentId || '');
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/moviecollections.js

@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'collections';
+        return LibraryBrowser.getSavedQueryKey('collections');
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/moviegenres.js

@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/movies.js

@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'movies';
+        return LibraryBrowser.getSavedQueryKey('movies');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/moviestudios.js

@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'studios'
+        return LibraryBrowser.getSavedQueryKey('studios');
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/movietrailers.js

@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'trailers';
+        return LibraryBrowser.getSavedQueryKey('trailers');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/musicalbumartists.js

@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'albumartists';
+        return LibraryBrowser.getSavedQueryKey('albumartists');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/musicalbums.js

@@ -34,7 +34,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'albums';
+        return LibraryBrowser.getSavedQueryKey('albums');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/musicartists.js

@@ -33,7 +33,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'artists';
+        return LibraryBrowser.getSavedQueryKey('artists');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/musicgenres.js

@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {

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) {

dashboard-ui/scripts/playlistedit.js

@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
 

dashboard-ui/scripts/playlists.js

@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function showLoadingMessage(page) {

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 () {
 

dashboard-ui/scripts/secondaryitems.js

@@ -66,7 +66,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl();
+        return LibraryBrowser.getSavedQueryKey();
     }
 
     function onListItemClick(e) {

dashboard-ui/scripts/songs.js

@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'songs';
+        return LibraryBrowser.getSavedQueryKey('songs');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/tvgenres.js

@@ -32,7 +32,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'genres';
+        return LibraryBrowser.getSavedQueryKey('genres');
     }
 
     function reloadItems(page) {

dashboard-ui/scripts/tvshows.js

@@ -35,7 +35,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'series';
+        return LibraryBrowser.getSavedQueryKey('series');
     }
 
     function reloadItems(page, viewPanel) {

dashboard-ui/scripts/tvstudios.js

@@ -29,7 +29,7 @@
 
     function getSavedQueryKey() {
 
-        return getWindowUrl() + 'studios'
+        return LibraryBrowser.getSavedQueryKey('studios');
     }
 
     function reloadItems(page) {