From 4f96263e3b72124df7b152e5dd2b513683fda818 Mon Sep 17 00:00:00 2001
From: 8chan <admin@8chan.co>
Date: Tue, 21 Oct 2014 21:06:34 -0700
Subject: Upgrade jQuery mixitup, preserve settings, no animations

---
 js/catalog.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'js/catalog.js')

diff --git a/js/catalog.js b/js/catalog.js
index 768845f6..386557d9 100644
--- a/js/catalog.js
+++ b/js/catalog.js
@@ -1,8 +1,17 @@
 if (active_page == 'catalog') $(function(){
 
+	if (localStorage.catalog !== undefined) {
+		var catalog = JSON.parse(localStorage.catalog);
+	} else {
+		var catalog = {};
+		localStorage.catalog = JSON.stringify(catalog);
+	}
+
 	$("#sort_by").change(function(){
 		var value = this.value;
-		$("#sort-"+value).trigger("click");
+		$('#Grid').mixItUp('sort', value);
+		catalog.sort_by = value;
+		localStorage.catalog = JSON.stringify(catalog);
 	});
 
 	$("#image_size").change(function(){
@@ -11,9 +20,21 @@ if (active_page == 'catalog') $(function(){
 		$(".grid-li").removeClass("grid-size-small");
 		$(".grid-li").removeClass("grid-size-large");
 		$(".grid-li").addClass("grid-size-"+value);
+		catalog.image_size = value;
+		localStorage.catalog = JSON.stringify(catalog);
 	});
 
-	$('#Grid').mixitup({
+	$('#Grid').mixItUp({
+		animation: {
+			enable: false
+		},
 	});
 
+	if (catalog.sort_by !== undefined) {
+		$('#sort_by').val(catalog.sort_by).trigger('change');
+	}
+	if (catalog.image_size !== undefined) {
+		$('#image_size').val(catalog.image_size).trigger('change');
+	}
+
 });
-- 
cgit v1.3