upgrade dependencies to latest versions and fix bugs

assets/js/app.jsx

@@ -4,11 +4,12 @@ global.jQuery = require('jquery');
 require('bootstrap');
 
 var React = require('react');
+var ReactDOM = require('react-dom');
 
 // React components
 var WakaTime = require('./components/WakaTime.jsx');
 
-React.render(
+ReactDOM.render(
     <WakaTime />,
     document.getElementById('wakatime')
 );

assets/js/components/Options.jsx

@@ -1,8 +1,7 @@
 /* global chrome */
 
 var React = require('react');
-var ReactAddons = require('react/addons');
-var ReactCSSTransitionGroup = ReactAddons.addons.CSSTransitionGroup;
+var ReactCSSTransitionGroup = require('react-addons-css-transition-group');
 
 var config = require('../config');
 
@@ -212,4 +211,4 @@ var Options = React.createClass({
     }
 });
 
-module.exports = Options;
+module.exports = Options;

assets/js/components/WakaTime.jsx

@@ -10,7 +10,7 @@ var NavBar = require('./NavBar.jsx');
 var MainList = require('./MainList.jsx');
 
 // Core
-var WakaTimeOriginal = require('../core/WakaTime');
+var WakaTimeCore = require('../core/WakaTimeCore').default;
 
 // Helpers
 var changeExtensionState = require('../helpers/changeExtensionState');
@@ -32,7 +32,7 @@ var Wakatime = React.createClass({
 
     componentDidMount: function() {
 
-        var wakatime = new WakaTimeOriginal();
+        var wakatime = new WakaTimeCore();
 
         var that = this;
 
@@ -170,4 +170,4 @@ var Wakatime = React.createClass({
 
 });
 
-module.exports = Wakatime;
+module.exports = Wakatime;

assets/js/core/WakaTimeCore.js

@@ -12,7 +12,7 @@ var changeExtensionState = require('../helpers/changeExtensionState');
 var in_array = require('./../helpers/in_array');
 var contains = require('./../helpers/contains');
 
-class WakaTime {
+class WakaTimeCore {
 
     constructor() {
         this.tabsWithDevtoolsOpen = [];
@@ -253,4 +253,4 @@ class WakaTime {
 
 }
 
-export default WakaTime;
+export default WakaTimeCore;

assets/js/events.js

@@ -1,10 +1,10 @@
 /* global chrome */
 
 // Core
-var WakaTime = require("./core/WakaTime");
+var WakaTimeCore = require("./core/WakaTimeCore").default;
 
 // initialize class
-var wakatime = new WakaTime();
+var wakatime = new WakaTimeCore();
 
 // Holds currently open connections (ports) with devtools
 // Uses tabId as index key.
@@ -97,4 +97,4 @@ chrome.runtime.onConnect.addListener(function (port) {
         });
 
     }
-});
+});

assets/js/options.jsx

@@ -5,11 +5,12 @@ global.jQuery = require('jquery');
 require('bootstrap');
 
 var React = require('react');
+var ReactDOM = require('react-dom');
 
 // React components
 var Options = require('./components/Options.jsx');
 
-React.render(
+ReactDOM.render(
     <Options />,
     document.getElementById('wakatime-options')
-);
+);