moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix-emoji-sort-chrome' into 'develop' 

fix #1037 chrome sorting didn't like 0, other sorter was just outright broken

Closes #1037

See merge request pleroma/pleroma-fe!1321
This commit is contained in:
HJ 2021-01-04 19:44:19 +00:00
parent 9d45db959f 4b0308ad1f
commit bc23266d70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/instance.js
View File

@ -127,7 +127,7 @@ const instance = {
imageUrl: false, imageUrl: false,
replacement: values[key] replacement: values[key]
} }
}).sort((a, b) => a.displayText - b.displayText) }).sort((a, b) => a.name > b.name ? 1 : -1)
commit('setInstanceOption', { name: 'emoji', value: emoji }) commit('setInstanceOption', { name: 'emoji', value: emoji })
} else { } else {
throw (res) throw (res)
@ -154,7 +154,7 @@ const instance = {
} }
// Technically could use tags but those are kinda useless right now, // Technically could use tags but those are kinda useless right now,
// should have been "pack" field, that would be more useful // should have been "pack" field, that would be more useful
}).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0) }).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : -1)
commit('setInstanceOption', { name: 'customEmoji', value: emoji }) commit('setInstanceOption', { name: 'customEmoji', value: emoji })
} else { } else {
throw (res) throw (res)