diff --git a/PlexRequests.UI/Content/custom.scss b/PlexRequests.UI/Content/custom.scss index 11c81ec37..df29fcfc8 100644 --- a/PlexRequests.UI/Content/custom.scss +++ b/PlexRequests.UI/Content/custom.scss @@ -5,9 +5,7 @@ $info-colour: #5bc0de; $warning-colour: #f0ad4e; $danger-colour: #d9534f; $success-colour: #5cb85c; -$i: -!important -; +$i:!important; @media (min-width: 768px ) { .row { diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index 1ce08c10b..dc1ae5b16 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -16,14 +16,31 @@ tvLoad(); $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { var target = $(e.target).attr('href'); + var activeState = ""; if (target === "#TvShowTab") { + if ($('#movieList').mixItUp('isLoaded')) { + activeState = $('#movieList').mixItUp('getState'); + $('#movieList').mixItUp('destroy'); + } if (!$('#tvList').mixItUp('isLoaded')) { $('#tvList').mixItUp({ - layout: { - display: 'block' - }, load: { - filter: 'all' + filter: activeState.activeFilter || 'all', + sort: activeState.activeSort || 'default:asc' + } + }); + } + } + if (target === "#MoviesTab") { + if ($('#tvList').mixItUp('isLoaded')) { + activeState = $('#tvList').mixItUp('getState'); + $('#tvList').mixItUp('destroy'); + } + if (!$('#movieList').mixItUp('isLoaded')) { + $('#movieList').mixItUp({ + load: { + filter: activeState.activeFilter || 'all', + sort: activeState.activeSort || 'default:asc' } }); } diff --git a/PlexRequests.UI/compilerconfig.json b/PlexRequests.UI/compilerconfig.json index 4703ee634..789c03398 100644 --- a/PlexRequests.UI/compilerconfig.json +++ b/PlexRequests.UI/compilerconfig.json @@ -6,9 +6,5 @@ { "outputFile": "Content/pace.css", "inputFile": "Content/pace.scss" - }, - { - "outputFile": "Content/requests.es5.js", - "inputFile": "Content/requests.js" } ] \ No newline at end of file