From d8b13b46f7a6fd934b7b76fd221f728108a410e2 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 12 Jul 2018 11:33:11 +0200 Subject: [PATCH] Move privacyPreference to utils --- app/javascript/flavours/glitch/reducers/compose.js | 6 +----- app/javascript/flavours/glitch/util/privacy_preference.js | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 app/javascript/flavours/glitch/util/privacy_preference.js diff --git a/app/javascript/flavours/glitch/reducers/compose.js b/app/javascript/flavours/glitch/reducers/compose.js index 9c2a501e144..e937b3ccf0f 100644 --- a/app/javascript/flavours/glitch/reducers/compose.js +++ b/app/javascript/flavours/glitch/reducers/compose.js @@ -35,6 +35,7 @@ import { STORE_HYDRATE } from 'flavours/glitch/actions/store'; import { REDRAFT } from 'flavours/glitch/actions/statuses'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import uuid from 'flavours/glitch/util/uuid'; +import { privacyPreference } from 'flavours/glitch/util/privacy_preference'; import { me } from 'flavours/glitch/util/initial_state'; import { overwrite } from 'flavours/glitch/util/js_helpers'; import { unescapeHTML } from 'flavours/glitch/util/html'; @@ -206,11 +207,6 @@ const insertEmoji = (state, position, emojiData) => { }); }; -const privacyPreference = (a, b) => { - const order = ['public', 'unlisted', 'private', 'direct']; - return order[Math.max(order.indexOf(a), order.indexOf(b), 0)]; -}; - const hydrate = (state, hydratedState) => { state = clearAll(state.merge(hydratedState)); diff --git a/app/javascript/flavours/glitch/util/privacy_preference.js b/app/javascript/flavours/glitch/util/privacy_preference.js new file mode 100644 index 00000000000..7781ca7faa7 --- /dev/null +++ b/app/javascript/flavours/glitch/util/privacy_preference.js @@ -0,0 +1,5 @@ +export const order = ['public', 'unlisted', 'private', 'direct']; + +export function privacyPreference (a, b) { + return order[Math.max(order.indexOf(a), order.indexOf(b), 0)]; +};