Merge pull request #23288 from nextcloud/backport/23275/stable20

[stable20] Fix dashboard statuses sort
This commit is contained in:
Roeland Jago Douma 2020-10-08 20:06:03 +02:00 committed by GitHub
commit e58134e0c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -178,7 +178,7 @@ export default {
return (status) => !(status in this.enabledStatuses) || this.enabledStatuses[status]
},
sortedAllStatuses() {
return Object.keys(this.allCallbacksStatus).slice().sort((a, b) => a > b)
return Object.keys(this.allCallbacksStatus).slice().sort(this.sortStatuses)
},
sortedPanels() {
return Object.values(this.panels).sort((a, b) => {
@ -191,7 +191,7 @@ export default {
})
},
sortedRegisteredStatus() {
return this.registeredStatus.slice().sort((a, b) => a > b)
return this.registeredStatus.slice().sort(this.sortStatuses)
},
},
watch: {
@ -350,6 +350,15 @@ export default {
}
this.saveStatuses()
},
sortStatuses(a, b) {
const al = a.toLowerCase()
const bl = b.toLowerCase()
return al > bl
? 1
: al < bl
? -1
: 0
},
handleScroll() {
if (window.scrollY > 70) {
document.body.classList.add('dashboard--scrolled')