diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx index 929391927..dab63c4ce 100644 --- a/app/javascript/flavours/glitch/features/local_settings/page/index.jsx +++ b/app/javascript/flavours/glitch/features/local_settings/page/index.jsx @@ -17,12 +17,6 @@ import LocalSettingsPageItem from './item'; // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * const messages = defineMessages({ - layout_auto: { id: 'layout.auto', defaultMessage: 'Auto' }, - layout_auto_hint: { id: 'layout.hint.auto', defaultMessage: 'Automatically chose layout based on “Enable advanced web interface” setting and screen size.' }, - layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' }, - layout_desktop_hint: { id: 'layout.hint.desktop', defaultMessage: 'Use multiple-column layout regardless of the “Enable advanced web interface” setting or screen size.' }, - layout_mobile: { id: 'layout.single', defaultMessage: 'Mobile' }, - layout_mobile_hint: { id: 'layout.hint.single', defaultMessage: 'Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.' }, side_arm_none: { id: 'settings.side_arm.none', defaultMessage: 'None' }, side_arm_keep: { id: 'settings.side_arm_reply_mode.keep', defaultMessage: 'Keep its set privacy' }, side_arm_copy: { id: 'settings.side_arm_reply_mode.copy', defaultMessage: 'Copy privacy setting of the toot being replied to' }, @@ -166,19 +160,6 @@ class LocalSettingsPage extends PureComponent {

- - - ({ hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0, hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0, canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4, - layout_local_setting: state.getIn(['local_settings', 'layout']), isWide: state.getIn(['local_settings', 'stretch']), dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null, unreadNotifications: state.getIn(['notifications', 'unread']), @@ -256,7 +255,6 @@ class UI extends Component { static propTypes = { dispatch: PropTypes.func.isRequired, children: PropTypes.node, - layout_local_setting: PropTypes.string, isWide: PropTypes.bool, systemFontUi: PropTypes.bool, isComposing: PropTypes.bool, @@ -381,7 +379,7 @@ class UI extends Component { }); handleResize = () => { - const layout = layoutFromWindow(this.props.layout_local_setting); + const layout = layoutFromWindow(); if (layout !== this.props.layout) { this.handleLayoutChange.cancel(); @@ -445,19 +443,6 @@ class UI extends Component { } } - UNSAFE_componentWillReceiveProps (nextProps) { - if (nextProps.layout_local_setting !== this.props.layout_local_setting) { - const layout = layoutFromWindow(nextProps.layout_local_setting); - - if (layout !== this.props.layout) { - this.handleLayoutChange.cancel(); - this.props.dispatch(changeLayout(layout)); - } else { - this.handleLayoutChange(); - } - } - } - componentDidUpdate (prevProps) { if (this.props.unreadNotifications !== prevProps.unreadNotifications || this.props.showFaviconBadge !== prevProps.showFaviconBadge) { diff --git a/app/javascript/flavours/glitch/is_mobile.ts b/app/javascript/flavours/glitch/is_mobile.ts index d69beb240..b3669e1bf 100644 --- a/app/javascript/flavours/glitch/is_mobile.ts +++ b/app/javascript/flavours/glitch/is_mobile.ts @@ -7,24 +7,13 @@ const LAYOUT_BREAKPOINT = 630; export const isMobile = (width: number) => width <= LAYOUT_BREAKPOINT; export type LayoutType = 'mobile' | 'single-column' | 'multi-column'; -export const layoutFromWindow = (layout_local_setting: string): LayoutType => { - switch (layout_local_setting) { - case 'multiple': - return 'multi-column'; - case 'single': - if (isMobile(window.innerWidth)) { - return 'mobile'; - } else { - return 'single-column'; - } - default: - if (isMobile(window.innerWidth)) { - return 'mobile'; - } else if (forceSingleColumn) { - return 'single-column'; - } else { - return 'multi-column'; - } +export const layoutFromWindow = (): LayoutType => { + if (isMobile(window.innerWidth)) { + return 'mobile'; + } else if (forceSingleColumn) { + return 'single-column'; + } else { + return 'multi-column'; } }; diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json index 555375053..2a93f94aa 100644 --- a/app/javascript/flavours/glitch/locales/en.json +++ b/app/javascript/flavours/glitch/locales/en.json @@ -64,12 +64,6 @@ "keyboard_shortcuts.bookmark": "to bookmark", "keyboard_shortcuts.secondary_toot": "to send toot using secondary privacy setting", "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse toots", - "layout.auto": "Auto", - "layout.desktop": "Desktop", - "layout.hint.auto": "Automatically chose layout based on “Enable advanced web interface” setting and screen size.", - "layout.hint.desktop": "Use multiple-column layout regardless of the “Enable advanced web interface” setting or screen size.", - "layout.hint.single": "Use single-column layout regardless of the “Enable advanced web interface” setting or screen size.", - "layout.single": "Mobile", "media_gallery.sensitive": "Sensitive", "moved_to_warning": "This account is marked as moved to {moved_to_link}, and may thus not accept new follows.", "navigation_bar.app_settings": "App settings", @@ -145,7 +139,6 @@ "settings.image_backgrounds_media_hint": "If the post has any media attachment, use the first one as a background", "settings.image_backgrounds_users": "Give collapsed toots an image background", "settings.inline_preview_cards": "Inline preview cards for external links", - "settings.layout": "Layout:", "settings.layout_opts": "Layout options", "settings.media": "Media", "settings.media_fullwidth": "Full-width media previews", diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js index 21e9dcec2..712f115d0 100644 --- a/app/javascript/flavours/glitch/reducers/local_settings.js +++ b/app/javascript/flavours/glitch/reducers/local_settings.js @@ -6,7 +6,6 @@ import { LOCAL_SETTING_CHANGE, LOCAL_SETTING_DELETE } from 'flavours/glitch/acti import { STORE_HYDRATE } from 'flavours/glitch/actions/store'; const initialState = ImmutableMap({ - layout : 'auto', stretch : true, side_arm : 'none', side_arm_reply_mode : 'keep',