logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: bc23266d7087dca0653097fe48ae9eba3f6f55b8
parent 9d45db959f5c712a317ba9cfce317d8a55b9feb5
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon,  4 Jan 2021 19:44:19 +0000

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

Diffstat:

Msrc/modules/instance.js4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/instance.js b/src/modules/instance.js @@ -127,7 +127,7 @@ const instance = { imageUrl: false, 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 }) } else { throw (res) @@ -154,7 +154,7 @@ const instance = { } // Technically could use tags but those are kinda useless right now, // 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 }) } else { throw (res)