Browse Source

Merge branch 'requarks:main' into main

pull/6727/head
Kornel Javor 7 months ago
committed by GitHub
parent
commit
f0da041c2a
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
4 changed files with 4 additions and 13 deletions
  1. 5
      client/components/tags.vue
  2. 2
      dev/templates/legacy.pug
  3. 8
      server/index.js
  4. 2
      server/modules/comments/artalk/code.yml

5
client/components/tags.vue

@ -98,6 +98,7 @@
:search='innerSearch'
:loading='isLoading'
:options.sync='pagination'
@page-count='pageTotal = $event'
hide-default-footer
ref='dude'
)
@ -183,6 +184,7 @@ export default {
sortDesc: [false]
},
pages: [],
pageTotal: 0,
isLoading: true,
scrollStyle: {
vuescroll: {},
@ -214,9 +216,6 @@ export default {
tagsSelected () {
return _.filter(this.tags, t => _.includes(this.selection, t.tag))
},
pageTotal () {
return Math.ceil(this.pages.length / this.pagination.itemsPerPage)
},
orderByItems () {
return [
{ text: this.$t('tags:orderByField.creationDate'), value: 'createdAt' },

2
dev/templates/legacy.pug

@ -52,7 +52,7 @@ html
script(
crossorigin='anonymous'
src='https://polyfill.io/v3/polyfill.min.js?features=EventSource'
src='https://cdnjs.cloudflare.com/polyfill/v3/polyfill.min.js?features=EventSource'
)
//- JS

8
server/index.js

@ -8,14 +8,6 @@ const { nanoid } = require('nanoid')
const { DateTime } = require('luxon')
const { gte } = require('semver')
// ----------------------------------------
// Check Node.js version
// ----------------------------------------
if (gte(process.version, '21.0.0')) {
console.error('You\'re using an unsupported Node.js version. Please read the requirements.')
process.exit(1)
}
// ----------------------------------------
// Init WIKI instance
// ----------------------------------------

2
server/modules/comments/artalk/code.yml

@ -6,7 +6,7 @@ head: |
body: |
<script>
window.onload = function() {
new Artalk({
Artalk.init({
el: '#artalk-container',
pageKey: '{{pageId}}',
pageTitle: '',

Loading…
Cancel
Save