From 17e134f528826fd618469daaf467c36ee55a39bc Mon Sep 17 00:00:00 2001
From: Jim Driessen <jim@driessen.li>
Date: Wed, 1 Feb 2017 00:43:18 +0100
Subject: [PATCH] Save number of songs in the search table to a cookie.

---
 marietje/marietje/static/js/js.cookie-2.1.3.min.js |  2 ++
 marietje/marietje/static/js/manage.js              |  9 ++++++++-
 marietje/marietje/static/js/queue.js               | 11 +++++++----
 marietje/queues/templates/queues/queue.html        |  1 +
 marietje/songs/templates/songs/manage.html         |  1 +
 5 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 marietje/marietje/static/js/js.cookie-2.1.3.min.js

diff --git a/marietje/marietje/static/js/js.cookie-2.1.3.min.js b/marietje/marietje/static/js/js.cookie-2.1.3.min.js
new file mode 100644
index 0000000..ff0f37b
--- /dev/null
+++ b/marietje/marietje/static/js/js.cookie-2.1.3.min.js
@@ -0,0 +1,2 @@
+/*! js-cookie v2.1.3 | MIT */
+!function(a){var b=!1;if("function"==typeof define&&define.amd&&(define(a),b=!0),"object"==typeof exports&&(module.exports=a(),b=!0),!b){var c=window.Cookies,d=window.Cookies=a();d.noConflict=function(){return window.Cookies=c,d}}}(function(){function a(){for(var a=0,b={};a<arguments.length;a++){var c=arguments[a];for(var d in c)b[d]=c[d]}return b}function b(c){function d(b,e,f){var g;if("undefined"!=typeof document){if(arguments.length>1){if(f=a({path:"/"},d.defaults,f),"number"==typeof f.expires){var h=new Date;h.setMilliseconds(h.getMilliseconds()+864e5*f.expires),f.expires=h}try{g=JSON.stringify(e),/^[\{\[]/.test(g)&&(e=g)}catch(i){}return e=c.write?c.write(e,b):encodeURIComponent(e+"").replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g,decodeURIComponent),b=encodeURIComponent(b+""),b=b.replace(/%(23|24|26|2B|5E|60|7C)/g,decodeURIComponent),b=b.replace(/[\(\)]/g,escape),document.cookie=b+"="+e+(f.expires?"; expires="+f.expires.toUTCString():"")+(f.path?"; path="+f.path:"")+(f.domain?"; domain="+f.domain:"")+(f.secure?"; secure":"")}b||(g={});for(var j=document.cookie?document.cookie.split("; "):[],k=/(%[0-9A-Z]{2})+/g,l=0;l<j.length;l++){var m=j[l].split("="),n=m.slice(1).join("=");'"'===n.charAt(0)&&(n=n.slice(1,-1));try{var o=m[0].replace(k,decodeURIComponent);if(n=c.read?c.read(n,o):c(n,o)||n.replace(k,decodeURIComponent),this.json)try{n=JSON.parse(n)}catch(i){}if(b===o){g=n;break}b||(g[o]=n)}catch(i){}}return g}}return d.set=d,d.get=function(a){return d.call(d,a)},d.getJSON=function(){return d.apply({json:!0},[].slice.call(arguments))},d.defaults={},d.remove=function(b,c){d(b,"",a(c,{expires:-1}))},d.withConverter=b,d}return b(function(){})});
\ No newline at end of file
diff --git a/marietje/marietje/static/js/manage.js b/marietje/marietje/static/js/manage.js
index cdcc6aa..2adc700 100644
--- a/marietje/marietje/static/js/manage.js
+++ b/marietje/marietje/static/js/manage.js
@@ -1,15 +1,22 @@
 $(function () {
+    $('.pagesize').val(Cookies.get('pagesize'));
     $(document).on('click', '[data-song-id]', function () {
         var songId = $(this).data('song-id');
         window.location.href = "/songs/edit/" + songId;
         return false;
     });
+
+    $('.pagenum').change(function(){
+        getSongs();
+    });
     
-    $('#search-artist, #search-title, #search-uploader, .pagenum').change(function(){
+    $('#search-artist, #search-title, #search-uploader').change(function(){
+        $('.pagenum').val(1);
         getSongs();
     });
     
     $('.pagesize').change(function(){
+        Cookies.set('pagesize', $(this).val());
         $('.pagenum').val(1);
         getSongs();
     });
diff --git a/marietje/marietje/static/js/queue.js b/marietje/marietje/static/js/queue.js
index c8c3153..1c0e380 100644
--- a/marietje/marietje/static/js/queue.js
+++ b/marietje/marietje/static/js/queue.js
@@ -10,6 +10,7 @@ var iteration = 0;
 var requestViewOpen = false;
 
 $(function () {
+    $('.pagesize').val(Cookies.get('pagesize'));
     refreshQueue();
     setInterval(updateTime, 1000);
 
@@ -38,14 +39,16 @@ $(function () {
     });
     
     $('.pagenum').change(function(){
-        console.log('Page: ' + $(this).val());
-    });
-    
-    $('#search-all, #search-uploader, .pagenum').change(function(){
         getSongs();
     });
     
+    $('#search-all, #search-uploader').change(function(){
+        $('.pagenum').val(1);
+        getSongs();
+    });
+
     $('.pagesize').change(function(){
+        Cookies.set('pagesize', $(this).val());
         $('.pagenum').val(1);
         getSongs();
     });
diff --git a/marietje/queues/templates/queues/queue.html b/marietje/queues/templates/queues/queue.html
index cb35193..bca58ff 100644
--- a/marietje/queues/templates/queues/queue.html
+++ b/marietje/queues/templates/queues/queue.html
@@ -90,6 +90,7 @@
     </div>
 </div>
 
+<script type="text/javascript" src="{% static 'js/js.cookie-2.1.3.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/queue.js' %}"></script>
 <script type="text/javascript">
 var csrf_token = "{{ csrf_token }}";
diff --git a/marietje/songs/templates/songs/manage.html b/marietje/songs/templates/songs/manage.html
index 9185f0e..dd10c83 100644
--- a/marietje/songs/templates/songs/manage.html
+++ b/marietje/songs/templates/songs/manage.html
@@ -39,6 +39,7 @@
         </tbody>
     </table>
 </div>
+<script type="text/javascript" src="{% static 'js/js.cookie-2.1.3.min.js' %}"></script>
 <script type="text/javascript" src="{% static 'js/manage.js' %}"></script>
 <script type="text/javascript">
 var csrf_token = "{{ csrf_token }}";