mirror of
https://github.com/kihashi/stardew_community_checklist.git
synced 2025-10-19 08:03:17 +00:00
Merge branch 'release/1.2' into gh-pages
This commit is contained in:
commit
b7b1b13c5f
@ -1230,6 +1230,10 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"seasons": [
|
"seasons": [
|
||||||
|
{
|
||||||
|
"id": "allseasons",
|
||||||
|
"name": "All Seasons"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "spring",
|
"id": "spring",
|
||||||
"name": "Spring"
|
"name": "Spring"
|
||||||
|
|||||||
@ -1,5 +1,13 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"id": "Version 1.2",
|
||||||
|
"date": "2016-04-14",
|
||||||
|
"link": "Version-1.2",
|
||||||
|
"changes": [
|
||||||
|
"Added an 'All Season' nav item in the Seasons tab. This shows items that are available in all seasons. Other season tabs now show items that are available in that season and at most 2 others. (#39)"
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "Version 1.1",
|
"id": "Version 1.1",
|
||||||
"date": "2016-04-14",
|
"date": "2016-04-14",
|
||||||
|
|||||||
@ -353,7 +353,7 @@
|
|||||||
<h3 class="title">{{ getSeasonName(active_season) }}</h3>
|
<h3 class="title">{{ getSeasonName(active_season) }}</h3>
|
||||||
<progress class="progress is-info" value="" max=""></progress>
|
<progress class="progress is-info" value="" max=""></progress>
|
||||||
<div class="columns is-multiline">
|
<div class="columns is-multiline">
|
||||||
<template v-for="item in static.items | filterBy active_season in 'seasons'">
|
<template v-for="item in static.items | seasonFilter active_season">
|
||||||
<div class="column is-3 is-flex" v-if="!(hideCompleted && isCompleted(item))">
|
<div class="column is-3 is-flex" v-if="!(hideCompleted && isCompleted(item))">
|
||||||
<div class="card is-fullwidth is-flex eq-line">
|
<div class="card is-fullwidth is-flex eq-line">
|
||||||
<header class="card-header">
|
<header class="card-header">
|
||||||
|
|||||||
14
main.js
14
main.js
@ -176,3 +176,17 @@ Vue.filter('filterByArray', function(array1, array2){
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Vue.filter('seasonFilter', function(items, season_id){
|
||||||
|
return items.filter(function(element){
|
||||||
|
if(season_id == "allseasons" && element.seasons.length > 3){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if(element.seasons.length < 4 && element.seasons.indexOf(season_id) > -1){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user