diff --git a/src/redux/reducer.js b/src/redux/reducer.js index 82893d9ba..de4096495 100644 --- a/src/redux/reducer.js +++ b/src/redux/reducer.js @@ -4,7 +4,7 @@ var scheduleReducer = require('./conference-schedule.js').scheduleReducer; var detailsReducer = require('./conference-details.js').detailsReducer; var permissionsReducer = require('./permissions.js').permissionsReducer; var sessionReducer = require('./session.js').sessionReducer; -var navigation = require('./navigation.js').navigation; +var navigationReducer = require('./navigation.js').navigation; var appReducer = combineReducers({ session: sessionReducer, diff --git a/src/views/search/search.jsx b/src/views/search/search.jsx index c85023511..1a57243d9 100644 --- a/src/views/search/search.jsx +++ b/src/views/search/search.jsx @@ -13,8 +13,7 @@ var Input = require('../../components/forms/input.jsx'); var Button = require('../../components/forms/button.jsx'); var Tabs = require('../../components/tabs/tabs.jsx'); var Grid = require('../../components/grid/grid.jsx'); - -var navigationDetails = require('../../../redux/navigation.js'); +var navigationActions = require('../../../redux/navigation.js'); require('./search.scss'); @@ -56,6 +55,7 @@ var Search = injectIntl(React.createClass({ }, componentDidMount: function () { this.getSearchMore(); + this.props.dispatch(navigationDetails.setSearchTerm(searchTerm)); }, getSearchMore: function () { var termText = ''; @@ -98,9 +98,6 @@ var Search = injectIntl(React.createClass({ } return allTab; }, - setSearchTerm: function (searchTerm) { - this.props.dispatch(navigationDetails.setSearchTerm(searchTerm)); - }, render: function () { var formatMessage = this.props.intl.formatMessage; @@ -146,10 +143,10 @@ var Search = injectIntl(React.createClass({ var mapStateToProps = function (state) { return { - navigationDetails: state.navigationDetails + searchTerm: state.searchTerm }; }; -var ConnectedDetails = connect(mapStateToProps)(Search); +var ConnectedSearch = connect(mapStateToProps)(Search); -render(<Page><ConnectedDetails /></Page>, document.getElementById('app')); +render(<Page><ConnectedSearch /></Page>, document.getElementById('app'));