scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-25 20:29:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions4

One Commit More ()

Browse source 
* Update reducer.js

* Update search.jsx
This commit is contained in:
The_Grits 2016-11-07 11:02:33 -05:00 • committed by GitHub
parent 8be3e11486
commit d9df101a66
2 changed files with 6 additions and 9 deletions
src
redux
reducer.js
views/search
search.jsx

2
src/redux/reducer.js
View file

@ -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,

13
src/views/search/search.jsx
View file

@ -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'));