treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Move privacyPreference to utils

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Thibaut Girka 2018-07-12 11:33:11 +02:00 committed by ThibG
parent cd05378b59
commit d8b13b46f7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/reducers/compose.js
View File

@ -35,6 +35,7 @@ import { STORE_HYDRATE } from 'flavours/glitch/actions/store';
import { REDRAFT } from 'flavours/glitch/actions/statuses'; import { REDRAFT } from 'flavours/glitch/actions/statuses';
import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
import uuid from 'flavours/glitch/util/uuid'; import uuid from 'flavours/glitch/util/uuid';
import { privacyPreference } from 'flavours/glitch/util/privacy_preference';
import { me } from 'flavours/glitch/util/initial_state'; import { me } from 'flavours/glitch/util/initial_state';
import { overwrite } from 'flavours/glitch/util/js_helpers'; import { overwrite } from 'flavours/glitch/util/js_helpers';
import { unescapeHTML } from 'flavours/glitch/util/html'; 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) => { const hydrate = (state, hydratedState) => {
state = clearAll(state.merge(hydratedState)); state = clearAll(state.merge(hydratedState));

5
app/javascript/flavours/glitch/util/privacy_preference.js Normal file
View File

@ -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)];
};