Author: jruchaud Date: 2015-05-26 09:59:25 +0000 (Tue, 26 May 2015) New Revision: 1479 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1479 Log: Separate App form main.js Modified: wit/index.html wit/js/main.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 09:57:34 UTC (rev 1478) +++ wit/index.html 2015-05-26 09:59:25 UTC (rev 1479) @@ -8,6 +8,7 @@ <script type="text/jsx" src="js/router/Routes.js"></script> <script type="text/jsx" src="js/router/Link.js"></script> + <script type="text/jsx" src="js/App.js"></script> <script type="text/jsx" src="js/components/InputTag.js"></script> <script type="text/jsx" src="js/components/Tags.js"></script> Modified: wit/js/main.js =================================================================== --- wit/js/main.js 2015-05-26 09:57:34 UTC (rev 1478) +++ wit/js/main.js 2015-05-26 09:59:25 UTC (rev 1479) @@ -33,73 +33,6 @@ // React conf // var React = require("react"); - -var App = React.createClass({ - - openRapport: function() { - this.refs.rapportDropdown.getDOMNode().classList.toggle("open"); - this.refs.editionDropdown.getDOMNode().classList.remove("open"); - }, - - openEdition: function() { - this.refs.editionDropdown.getDOMNode().classList.toggle("open"); - this.refs.rapportDropdown.getDOMNode().classList.remove("open"); - }, - - closeAll: function() { - this.refs.editionDropdown.getDOMNode().classList.remove("open"); - this.refs.rapportDropdown.getDOMNode().classList.remove("open"); - }, - - render: function() { - return <div className="container-fluid"> - - <div className="navbar navbar-default"> - <div className="navbar-header pull-left"> - <a className="navbar-brand" href="#">WIT</a> - </div> - - <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 ref="rapportDropdown" className="dropdown pull-left"> - <a className="dropdown-toggle" onClick={this.openRapport}> - Rapport <span className="caret"></span> - </a> - <ul className="dropdown-menu"> - <li><Link onClick={this.closeAll} 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> - </ul> - </li> - - <li ref="editionDropdown" className="dropdown pull-left"> - <a className="dropdown-toggle" onClick={this.openEdition}> - Edition <span className="caret"></span> - </a> - <ul className="dropdown-menu"> - <li><Link onClick={this.closeAll} 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> - </ul> - </div> - </div> - <Routes> - <Timer /> - <Rapport /> - <Options /> - <EditionLogs /> - </Routes> - </div>; - } -}); - React.render(<App/>, document.body); var popups = []; @@ -135,6 +68,5 @@ }; // Subscriptions to services - scope.timer.subscribeIdle(openWindow.bind(null, "idle.html")); scope.user.subscribeActivityChange(openWindow.bind(null, "activityChange.html"));