kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #42 from ra100/master

Browse Source 
Fix save options
This commit is contained in:
Alan Hamlett
2016-06-30 10:49:59 -07:00
committed by GitHub
parent 304aeb2a4c 7d90992aac
commit 97fd59eff9
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/components/Navbar.jsx → assets/js/components/NavBar.jsx
View File

@@ -1,6 +1,6 @@
var React = require('react'); var React = require('react');
var Navbar = React.createClass({ var NavBar = React.createClass({
render: function() { render: function() {
@@ -86,4 +86,4 @@ var Navbar = React.createClass({
}); });
module.exports = Navbar; module.exports = NavBar;

16
assets/js/components/Options.jsx
View File

@@ -52,9 +52,9 @@ var Options = React.createClass({
loggingStyle: items.loggingStyle loggingStyle: items.loggingStyle
}); });
React.findDOMNode(that.refs.theme).value = items.theme; that.refs.theme.value = items.theme;
React.findDOMNode(that.refs.loggingType).value = items.loggingType; that.refs.loggingType.value = items.loggingType;
React.findDOMNode(that.refs.loggingStyle).value = items.loggingStyle; that.refs.loggingStyle.value = items.loggingStyle;
}); });
}, },
@@ -67,9 +67,9 @@ var Options = React.createClass({
saveSettings: function () { saveSettings: function () {
var that = this; var that = this;
var theme = React.findDOMNode(this.refs.theme).value.trim(); var theme = this.refs.theme.value.trim();
var loggingType = React.findDOMNode(this.refs.loggingType).value.trim(); var loggingType = this.refs.loggingType.value.trim();
var loggingStyle = React.findDOMNode(this.refs.loggingStyle).value.trim(); var loggingStyle = this.refs.loggingStyle.value.trim();
// Trimming blacklist and whitelist removes blank lines and spaces. // Trimming blacklist and whitelist removes blank lines and spaces.
var blacklist = that.state.blacklist.trim(); var blacklist = that.state.blacklist.trim();
var whitelist = that.state.whitelist.trim(); var whitelist = that.state.whitelist.trim();
@@ -95,7 +95,7 @@ var Options = React.createClass({
}, },
_displayBlackOrWhiteList: function () { _displayBlackOrWhiteList: function () {
var loggingStyle = React.findDOMNode(this.refs.loggingStyle).value.trim(); var loggingStyle = this.refs.loggingStyle.value.trim();
this.setState({loggingStyle: loggingStyle}); this.setState({loggingStyle: loggingStyle});
}, },
@@ -156,7 +156,7 @@ var Options = React.createClass({
<div className="row"> <div className="row">
<div className="col-md-12"> <div className="col-md-12">
<ReactCSSTransitionGroup transitionName="alert"> <ReactCSSTransitionGroup transitionName="alert" transitionEnterTimeout={500} transitionLeaveTimeout={300}>
{alert()} {alert()}
</ReactCSSTransitionGroup> </ReactCSSTransitionGroup>