diff options
| author | Appleman1234 <applemansigloo@gmail.com> | 2016-12-15 18:25:42 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-15 18:25:42 +0900 |
| commit | cae526e65a20f3da2d8884c4d8e8978c54120000 (patch) | |
| tree | 2954153dd49f616f5018490058ff4bfbd17300d3 /js/catalog.js | |
| parent | b58fab98147a92c8e6d22f15d23684508b6bb811 (diff) | |
| parent | 5feae402cb55d49963bfd2c6f5a33d10690ecbc1 (diff) | |
Merge pull request #79 from lainchan/clean_prod_vichan_update
Merge vichan changes from upstream and changes directly applied to the site.
Diffstat (limited to 'js/catalog.js')
| -rw-r--r-- | js/catalog.js | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/js/catalog.js b/js/catalog.js index f64e22d4..9adaeaef 100644 --- a/js/catalog.js +++ b/js/catalog.js @@ -1,8 +1,16 @@ 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 == "random" ? value : "sticky:desc " + value));
+ catalog.sort_by = value;
+ localStorage.catalog = JSON.stringify(catalog);
});
$("#image_size").change(function(){
@@ -11,7 +19,30 @@ 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');
+ }
+
+ $('div.thread').on('click', function(e) {
+ if ($(this).css('overflow-y') === 'hidden') {
+ $(this).css('overflow-y', 'auto');
+ $(this).css('width', '100%');
+ } else {
+ $(this).css('overflow-y', 'hidden');
+ $(this).css('width', 'auto');
+ }
+ });
});
|