diff --git a/src/components/CardStack.jsx b/src/components/CardStack.jsx index 8408f54..b9e3697 100644 --- a/src/components/CardStack.jsx +++ b/src/components/CardStack.jsx @@ -99,7 +99,7 @@ function mapStateToProps(state) { language: state.app.language, tools: state.ui.tools, isCardstack: state.ui.flags.isCardstack, - isLoading: state.ui.flags.isFetchingEvents + isLoading: state.ui.flags.isFetchingSources } } diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx index ea3c331..a0ebc67 100644 --- a/src/components/Dashboard.jsx +++ b/src/components/Dashboard.jsx @@ -46,11 +46,9 @@ class Dashboard extends React.Component { handleSelect(selected) { if (selected) { let eventsToSelect = selected.map(event => this.getEventById(event.id)); - const parser = this.props.ui.tools.parser; + const p = this.props.ui.tools.parser; - eventsToSelect = eventsToSelect.sort((a, b) => { - return parser(a.timestamp) - parser(b.timestamp); - }); + eventsToSelect = eventsToSelect.sort((a, b) => p(a.timestamp) - p(b.timestamp)) this.props.actions.fetchSelected(eventsToSelect) } diff --git a/src/reducers/ui.js b/src/reducers/ui.js index 8ead656..162102f 100644 --- a/src/reducers/ui.js +++ b/src/reducers/ui.js @@ -2,7 +2,7 @@ import initial from '../store/initial.js'; import { TOGGLE_FETCHING_DOMAIN, - TOGGLE_FETCHING_EVENTS, + TOGGLE_FETCHING_SOURCES, TOGGLE_VIEW, TOGGLE_TIMELINE, TOGGLE_INFOPOPUP, @@ -17,10 +17,10 @@ function toggleFetchingDomain(uiState, action) { }); } -function toggleFetchingEvents(uiState, action) { +function toggleFetchingSources(uiState, action) { return Object.assign({}, uiState, { flags: Object.assign({}, uiState.flags, { - isFetchingEvents: !uiState.flags.isFetchingEvents + isFetchingSources: !uiState.flags.isFetchingSources }) }); } @@ -45,8 +45,8 @@ function ui(uiState = initial.ui, action) { switch (action.type) { case TOGGLE_FETCHING_DOMAIN: return toggleFetchingDomain(uiState, action); - case TOGGLE_FETCHING_EVENTS: - return toggleFetchingEvents(uiState, action); + case TOGGLE_FETCHING_SOURCES: + return toggleFetchingSources(uiState, action); case TOGGLE_INFOPOPUP: return toggleInfoPopup(uiState, action); case TOGGLE_NOTIFICATIONS: diff --git a/src/store/initial.js b/src/store/initial.js index 509df37..5a3c03d 100644 --- a/src/store/initial.js +++ b/src/store/initial.js @@ -139,7 +139,7 @@ const initial = { }, flags: { isFetchingDomain: false, - isFetchingEvents: false, + isFetchingSources: false, isCardstack: true, isInfopopup: false,