diff --git a/marietje/marietje/static/js/queue.js b/marietje/marietje/static/js/queue.js index 88db7ce..172f631 100644 --- a/marietje/marietje/static/js/queue.js +++ b/marietje/marietje/static/js/queue.js @@ -48,11 +48,11 @@ $(function () { $('#cancel-request').click(function () { hideRequestTable(); }); - + $('.pagenum').change(function(){ getSongs(); }); - + $('#search-all, #search-uploader').change(function(){ $('.pagenum').val(1); getSongs(); @@ -63,24 +63,24 @@ $(function () { $('.pagenum').val(1); getSongs(); }); - + $('button.prev').click(function(){ var pageNumSelect = $('.pagenum'); pageNumSelect.val(Math.max(parseInt(pageNumSelect.val()) - 1, 1)); getSongs(); }); - + $('button.next').click(function(){ var pageNumSelect = $('.pagenum'); pageNumSelect.val(Math.min(parseInt(pageNumSelect.val()) + 1, pageNumSelect.children('option:last-child').val())); getSongs(); }); - + $('button.first').click(function(){ $('.pagenum').val(1); getSongs(); }); - + $('button.last').click(function(){ var pageNumSelect = $('.pagenum'); pageNumSelect.val(pageNumSelect.children('option:last-child').val()); @@ -279,6 +279,10 @@ function getSongs() } pageNumSelect.val(result.current_page); $('.pagesize').val(result.per_page); + refreshingSongs = false; + if(requestViewOpen) { + window.scrollTo(0, 0); + } }); }