Author: jruchaud Date: 2015-05-26 13:56:54 +0000 (Tue, 26 May 2015) New Revision: 1487 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1487 Log: Begin react startup Modified: wit/index.html wit/js/App.js wit/js/router/Link.js wit/js/router/Routes.js wit/js/services/NoTimerService.js Modified: wit/index.html =================================================================== --- wit/index.html 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/index.html 2015-05-26 13:56:54 UTC (rev 1487) @@ -6,10 +6,8 @@ global.document = window.document; global.navigator = window.navigator; global.localStorage = window.localStorage; - global.localStorage = window.localStorage; </script> - <script type="text/javascript" src="node_modules/react/dist/react-with-addons.js"></script> <script type="text/javascript" src="build/main.js"></script> <link rel="stylesheet" href="./node_modules/bootstrap/dist/css/bootstrap.min.css"> Modified: wit/js/App.js =================================================================== --- wit/js/App.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/App.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -4,7 +4,7 @@ var Routes = require("./router/Routes.js"); var Link = require("./router/Link.js"); -module.exports = class extends React.Component { +class App extends React.Component { openRapport() { this.refs.rapportDropdown.getDOMNode().classList.toggle("open"); @@ -60,12 +60,15 @@ </ul> </div> </div> - <Routes> + + </div>; + } +} + +/* <Routes> <Timer /> <Rapport /> <Options /> <EditionLogs /> - </Routes> - </div>; - } -}; + </Routes>*/ +module.exports = App; Modified: wit/js/router/Link.js =================================================================== --- wit/js/router/Link.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/router/Link.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -2,7 +2,7 @@ var React = require("react"); -global.module.exports = class extends React.Component { +class Link extends React.Component { goTo() { if (this.props.onClick) { @@ -15,4 +15,6 @@ render() { return <a href="#" onClick={this.goTo}>{this.props.children}</a>; } -}; +} + +module.exports = Link; Modified: wit/js/router/Routes.js =================================================================== --- wit/js/router/Routes.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/router/Routes.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -2,7 +2,7 @@ var React = require("react"); -global.module.exports = class extends React.Component { +class Routes extends React.Component { componentWillMount() { window.router = this; @@ -36,4 +36,6 @@ {this.getChild()} </div>; } -}; +} + +module.exports = Routes; Modified: wit/js/services/NoTimerService.js =================================================================== --- wit/js/services/NoTimerService.js 2015-05-26 13:46:29 UTC (rev 1486) +++ wit/js/services/NoTimerService.js 2015-05-26 13:56:54 UTC (rev 1487) @@ -1,10 +1,13 @@ "use strict"; var moment = require("moment"); +var config = require("../services/ConfigurationService.js"); +var timer = require("../services/TimerService.js"); + var notTimerTimer; exports.detect = function() { - var noTimerConfig = scope.config.getNoTimer(); + var noTimerConfig = config.getNoTimer(); if (noTimerConfig) { var duration = moment.duration(noTimerConfig, "m"); @@ -18,9 +21,9 @@ } }; -scope.timer.subscribeTimeChanged(function() { +timer.subscribeTimeChanged(function() { clearTimeout(notTimerTimer); - if (!scope.timer.time) { + if (!timer.time) { exports.detect(); } });