Author: jruchaud Date: 2015-05-26 14:47:48 +0000 (Tue, 26 May 2015) New Revision: 1495 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1495 Log: Fix router Modified: wit/js/App.js wit/js/components/Tags.js wit/js/router/Link.js wit/js/router/Routes.js Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 14:35:34 UTC (rev 1494) +++ wit/js/App.js 2015-05-26 14:47:48 UTC (rev 1495) @@ -35,14 +35,14 @@ <div className="nav navbar-header pull-right"> <ul className="nav pull-right"> - <li className="pull-left"><Link onClick={this.closeAll} to="Timer">Timer</Link></li> + <li className="pull-left"><Link onClick={this.closeAll.bind(this)} to="Timer">Timer</Link></li> <li ref="rapportDropdown" className="dropdown pull-left"> - <a className="dropdown-toggle" onClick={this.openRapport}> + <a className="dropdown-toggle" onClick={this.openRapport.bind(this)}> Rapport <span className="caret"></span> </a> <ul className="dropdown-menu"> - <li><Link onClick={this.closeAll} to="Rapport">By date</Link></li> + <li><Link onClick={this.closeAll.bind(this)} to="Rapport">By date</Link></li> <li><a href="#">By week</a></li> <li><a href="#">By month</a></li> <li><a href="#">By Year</a></li> @@ -50,17 +50,17 @@ </li> <li ref="editionDropdown" className="dropdown pull-left"> - <a className="dropdown-toggle" onClick={this.openEdition}> + <a className="dropdown-toggle" onClick={this.openEdition.bind(this)}> Edition <span className="caret"></span> </a> <ul className="dropdown-menu"> - <li><Link onClick={this.closeAll} to="EditionLogs">Logs</Link></li> + <li><Link onClick={this.closeAll.bind(this)} to="EditionLogs">Logs</Link></li> <li><a href="#">Tags</a></li> <li><a href="#">Activities</a></li> </ul> </li> - <li className="pull-left"><Link onClick={this.closeAll} to="Options">Options</Link></li> + <li className="pull-left"><Link onClick={this.closeAll.bind(this)} to="Options">Options</Link></li> </ul> </div> </div> Modified: wit/js/components/Tags.js =================================================================== --- wit/js/components/Tags.js 2015-05-26 14:35:34 UTC (rev 1494) +++ wit/js/components/Tags.js 2015-05-26 14:47:48 UTC (rev 1495) @@ -1,7 +1,8 @@ "use strict"; var React = require("react"); -var timer = require("../services/TimerService.js"); +var timer = require("../services/TimerService"); +var InputTag = require("./InputTag"); class Tags extends React.Component { Modified: wit/js/router/Link.js =================================================================== --- wit/js/router/Link.js 2015-05-26 14:35:34 UTC (rev 1494) +++ wit/js/router/Link.js 2015-05-26 14:47:48 UTC (rev 1495) @@ -4,16 +4,20 @@ class Link extends React.Component { + constructor(props) { + super(props); + } + goTo() { if (this.props.onClick) { this.props.onClick(); } - router.display(this.props.to); + global.router.display(this.props.to); } render() { - return <a href="#" onClick={this.goTo}>{this.props.children}</a>; + return <a href="#" onClick={this.goTo.bind(this)}>{this.props.children}</a>; } } Modified: wit/js/router/Routes.js =================================================================== --- wit/js/router/Routes.js 2015-05-26 14:35:34 UTC (rev 1494) +++ wit/js/router/Routes.js 2015-05-26 14:47:48 UTC (rev 1495) @@ -7,23 +7,21 @@ constructor(props) { super(props); this.state = {index: 0}; + global.router = this; } - componentWillMount() { - window.router = this; - } - display(to) { var children = this.props.children; for (var i = 0, l = children.length; i < l; i++) { var child = children[i]; - if (child.type.displayName === to) { + if (child.type.name === to) { this.setState({index: i}); break; } } + } getChild() {