From 9ac90ba4bb85e2fab5cfc73ad9d6f3ec71c5b854 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Thu, 28 Jan 2016 11:44:20 +0100 Subject: restoring build command --- src/web/js/app.js | 3 ++- src/web/js/components/Menu.react.js | 16 ++++++++++++---- src/web/js/components/MiddlePanel.react.js | 22 +++++++++++++++------- 3 files changed, 29 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/web/js/app.js b/src/web/js/app.js index 603172b3..00156670 100644 --- a/src/web/js/app.js +++ b/src/web/js/app.js @@ -8,10 +8,11 @@ */ var React = require('react'); +var ReactDOM = require('react-dom'); var MainApp = require('./components/MainApp.react'); -React.render( +ReactDOM.render( , document.getElementById('jarrapp') ); diff --git a/src/web/js/components/Menu.react.js b/src/web/js/components/Menu.react.js index 75255d41..f699f92e 100644 --- a/src/web/js/components/Menu.react.js +++ b/src/web/js/components/Menu.react.js @@ -20,7 +20,6 @@ var FeedItem = React.createClass({ render: function() { var icon = null; var badge_unread = null; - var style = null; if(this.props.icon_url){ icon = (); } else { @@ -152,21 +151,30 @@ var MenuFilter = React.createClass({ if (this.props.feed_in_error) { error_button = ( ); } return ( {error_button} ); }, + setAllFilter: function() { + MenuActions.setFilter("all"); + }, + setUnreadFilter: function() { + MenuActions.setFilter("unread"); + }, + setErrorFilter: function() { + MenuActions.setFilter("error"); + }, }); var Menu = React.createClass({ diff --git a/src/web/js/components/MiddlePanel.react.js b/src/web/js/components/MiddlePanel.react.js index 0a1dad45..01c8b696 100644 --- a/src/web/js/components/MiddlePanel.react.js +++ b/src/web/js/components/MiddlePanel.react.js @@ -60,13 +60,13 @@ var MiddlePanelFilter = React.createClass({ return ( @@ -76,10 +76,18 @@ var MiddlePanelFilter = React.createClass({ ); }, - setFilter: function(filter) { - this.setState({filter: filter}); - MiddlePanelActions.setFilter(filter); - } + setAllFilter: function() { + this.setState({filter: 'all'}); + MiddlePanelActions.setFilter('all'); + }, + setUnreadFilter: function() { + this.setState({filter: 'unread'}); + MiddlePanelActions.setFilter('unread'); + }, + setLikedFilter: function() { + this.setState({filter: 'liked'}); + MiddlePanelActions.setFilter('liked'); + }, }); var MiddlePanel = React.createClass({ -- cgit