]> cat aescling's git repositories - mastodon.git/commitdiff
move list items into an array, don't unnecessarily concat misc nav item
authorcwm <chriswmartin@protonmail.com>
Wed, 13 Dec 2017 04:50:20 +0000 (22:50 -0600)
committercwm <chriswmartin@protonmail.com>
Wed, 13 Dec 2017 04:50:20 +0000 (22:50 -0600)
app/javascript/flavours/glitch/features/getting_started/index.js

index 11fdd2344760ca9590a1105d08d4ec3bcd8f3b6d..af1021dca8cf65a15b659f015549d901f913ca1a 100644 (file)
@@ -76,6 +76,7 @@ export default class GettingStarted extends ImmutablePureComponent {
     const { intl, myAccount, columns, multiColumn, lists } = this.props;
 
     let navItems = [];
+    let listItems = [];
 
     if (multiColumn) {
       if (!columns.find(item => item.get('id') === 'HOME')) {
@@ -103,8 +104,15 @@ export default class GettingStarted extends ImmutablePureComponent {
       navItems.push(<ColumnLink key='5' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />);
     }
 
-    navItems = navItems.concat([
-      <ColumnLink key='6' icon='ellipsis-h' text={intl.formatMessage(messages.misc)} to='/getting-started-misc' />,
+    navItems.push(<ColumnLink key='6' icon='ellipsis-h' text={intl.formatMessage(messages.misc)} to='/getting-started-misc' />);
+
+    listItems = listItems.concat([
+      <div>
+        <ColumnLink key='7' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
+        {lists.map(list =>
+          <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
+        )}
+      </div>
     ]);
 
     return (
@@ -114,10 +122,7 @@ export default class GettingStarted extends ImmutablePureComponent {
             <ColumnSubheading text={intl.formatMessage(messages.navigation_subheading)} />
             {navItems}
             <ColumnSubheading text={intl.formatMessage(messages.lists_subheading)} />
-            <ColumnLink key='7' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
-            {lists.map(list =>
-              <ColumnLink key={list.get('id')} to={`/timelines/list/${list.get('id')}`} icon='list-ul' text={list.get('title')} />
-            )}
+            {listItems}
             <ColumnSubheading text={intl.formatMessage(messages.settings_subheading)} />
             <ColumnLink icon='cog' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />
             <ColumnLink icon='cogs' text={intl.formatMessage(messages.settings)} onClick={this.openSettings} />