diff options
author | ThibG <thib@sitedethib.com> | 2019-07-17 16:56:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-17 16:56:10 +0200 |
commit | e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791 (patch) | |
tree | 21f25d570ea6f57d58c24eec6e65aab8b96f816b /app/javascript/flavours/glitch/util | |
parent | 5ccd011cc3bafc00a557dabbb47da004f3d4a381 (diff) | |
parent | e91bf82083ac390a0cf229d8e94fa412fdec57ff (diff) |
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
Cherry-pick changes from upstream
Diffstat (limited to 'app/javascript/flavours/glitch/util')
-rw-r--r-- | app/javascript/flavours/glitch/util/compare_id.js | 5 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/util/initial_state.js | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/util/compare_id.js b/app/javascript/flavours/glitch/util/compare_id.js index aaff66481..66cf51c4b 100644 --- a/app/javascript/flavours/glitch/util/compare_id.js +++ b/app/javascript/flavours/glitch/util/compare_id.js @@ -1,10 +1,11 @@ -export default function compareId(id1, id2) { +export default function compareId (id1, id2) { if (id1 === id2) { return 0; } + if (id1.length === id2.length) { return id1 > id2 ? 1 : -1; } else { return id1.length > id2.length ? 1 : -1; } -} +}; diff --git a/app/javascript/flavours/glitch/util/initial_state.js b/app/javascript/flavours/glitch/util/initial_state.js index e8811a6ce..caaa79bb3 100644 --- a/app/javascript/flavours/glitch/util/initial_state.js +++ b/app/javascript/flavours/glitch/util/initial_state.js @@ -30,5 +30,6 @@ export const isStaff = getMeta('is_staff'); export const defaultContentType = getMeta('default_content_type'); export const forceSingleColumn = getMeta('advanced_layout') === false; export const useBlurhash = getMeta('use_blurhash'); +export const usePendingItems = getMeta('use_pending_items'); export default initialState; |