Skip to content

Commit

Permalink
Merge pull request #1470 from NicoPennec/fix/various
Browse files Browse the repository at this point in the history
Various fixes
  • Loading branch information
NicoPennec authored Jun 24, 2024
2 parents ae78a38 + 81ee016 commit 3d65a8a
Show file tree
Hide file tree
Showing 21 changed files with 175 additions and 175 deletions.
197 changes: 86 additions & 111 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@fullcalendar/multimonth": "6.1.14",
"@fullcalendar/vue": "6.1.14",
"@google/model-viewer": "3.5.0",
"@sentry/vue": "7.117.0",
"@sentry/vue": "8.11.0",
"async": "3.2.5",
"bowser": "2.11.0",
"chart.js": "2.9.4",
Expand All @@ -44,7 +44,7 @@
"textarea-caret": "3.1.0",
"thenby": "1.3.4",
"three": "0.163.0",
"uuid": "9.0.1",
"uuid": "10.0.0",
"v-autocomplete": "1.8.2",
"vue": "2.7.16",
"vue-at": "2.5.1",
Expand All @@ -62,7 +62,7 @@
"vuejs-datepicker": "1.6.2",
"vuex": "3.6.2",
"vuex-router-sync": "5.0.0",
"wavesurfer.js": "6.6.4"
"wavesurfer.js": "7.8.0"
},
"devDependencies": {
"@types/vue-feather-icons": "5.0.8",
Expand All @@ -80,7 +80,7 @@
"lint-staged": "15.2.7",
"localStorage": "1.0.4",
"prettier": "3.3.2",
"sass": "1.77.5",
"sass": "1.77.6",
"vite": "5.3.1",
"vitest": "0.34.6",
"vitest-localstorage-mock": "0.1.2",
Expand Down
3 changes: 1 addition & 2 deletions src/components/pages/Assets.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,9 @@
</div>

<sorting-info
:label="$t('main.sorted_by')"
:sorting="assetSorting"
@clear-sorting="onChangeSortClicked(null)"
v-if="assetSorting && assetSorting.length > 0"
v-if="assetSorting?.length"
/>
<asset-list
ref="asset-list"
Expand Down
3 changes: 1 addition & 2 deletions src/components/pages/Edits.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@
</div>

<sorting-info
:label="$t('main.sorted_by')"
:sorting="editSorting"
@clear-sorting="onChangeSortClicked(null)"
v-if="editSorting && editSorting.length > 0"
v-if="editSorting?.length"
/>
<edit-list
ref="edit-list"
Expand Down
4 changes: 1 addition & 3 deletions src/components/pages/Episodes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@
</div>

<sorting-info
:label="$t('main.sorted_by')"
:sorting="episodeSorting"
@clear-sorting="onChangeSortClicked(null)"
v-if="episodeSorting && episodeSorting.length > 0"
v-if="episodeSorting?.length"
/>

<episode-list
ref="episode-list"
:displayed-episodes="displayedEpisodes"
Expand Down
Loading

0 comments on commit 3d65a8a

Please sign in to comment.