Merge pull request #42 from ra100/master

Fix save options
wakatime · Jun 30, 2016 · 97fd59e · 97fd59e
2 parents 304aeb2 + 7d90992
commit 97fd59e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/assets/js/components/Navbar.jsx → assets/js/components/NavBar.jsx b/assets/js/components/Navbar.jsx → assets/js/components/NavBar.jsx
@@ -1,6 +1,6 @@
 var React = require('react');
 
-var Navbar = React.createClass({
+var NavBar = React.createClass({
 
     render: function() {
 
@@ -86,4 +86,4 @@ var Navbar = React.createClass({
 
 });
 
-module.exports = Navbar;
+module.exports = NavBar;
diff --git a/assets/js/components/Options.jsx b/assets/js/components/Options.jsx
@@ -52,9 +52,9 @@ var Options = React.createClass({
                 loggingStyle: items.loggingStyle
             });
 
-            React.findDOMNode(that.refs.theme).value = items.theme;
-            React.findDOMNode(that.refs.loggingType).value = items.loggingType;
-            React.findDOMNode(that.refs.loggingStyle).value = items.loggingStyle;
+            that.refs.theme.value = items.theme;
+            that.refs.loggingType.value = items.loggingType;
+            that.refs.loggingStyle.value = items.loggingStyle;
         });
     },
 
@@ -67,9 +67,9 @@ var Options = React.createClass({
     saveSettings: function () {
         var that = this;
 
-        var theme = React.findDOMNode(this.refs.theme).value.trim();
-        var loggingType = React.findDOMNode(this.refs.loggingType).value.trim();
-        var loggingStyle = React.findDOMNode(this.refs.loggingStyle).value.trim();
+        var theme = this.refs.theme.value.trim();
+        var loggingType = this.refs.loggingType.value.trim();
+        var loggingStyle = this.refs.loggingStyle.value.trim();
         // Trimming blacklist and whitelist removes blank lines and spaces.
         var blacklist = that.state.blacklist.trim();
         var whitelist = that.state.whitelist.trim();
@@ -95,7 +95,7 @@ var Options = React.createClass({
     },
 
     _displayBlackOrWhiteList: function () {
-        var loggingStyle = React.findDOMNode(this.refs.loggingStyle).value.trim();
+        var loggingStyle = this.refs.loggingStyle.value.trim();
 
         this.setState({loggingStyle: loggingStyle});
     },
@@ -156,7 +156,7 @@ var Options = React.createClass({
                 <div className="row">
                     <div className="col-md-12">
 
-                        <ReactCSSTransitionGroup transitionName="alert">
+                        <ReactCSSTransitionGroup transitionName="alert" transitionEnterTimeout={500} transitionLeaveTimeout={300}>
                             {alert()}
                         </ReactCSSTransitionGroup>