This commit is contained in:
dzannotti 2015-08-07 17:55:59 +01:00
parent 244b897a2e
commit 46e71e7bb3
7 changed files with 62 additions and 59 deletions

View File

@ -1,7 +1,7 @@
import React, { PropTypes, findDOMNode } from 'react'; import React, { PropTypes, findDOMNode } from 'react';
import LogMonitorEntry from './LogMonitorEntry'; import LogMonitorEntry from './LogMonitorEntry';
import LogMonitorButton from './LogMonitorButton'; import LogMonitorButton from './LogMonitorButton';
import * as themes from "./themes"; import * as themes from './themes';
const styles = { const styles = {
container: { container: {
@ -17,7 +17,7 @@ const styles = {
buttonBar: { buttonBar: {
paddingLeft: 2 paddingLeft: 2
} }
} };
export default class LogMonitor { export default class LogMonitor {
constructor() { constructor() {
@ -116,10 +116,10 @@ export default class LogMonitor {
let theme; let theme;
if (typeof this.props.theme === 'string') { if (typeof this.props.theme === 'string') {
if (typeof themes[this.props.theme] !== 'undefined') { if (typeof themes[this.props.theme] !== 'undefined') {
theme = themes[this.props.theme] theme = themes[this.props.theme];
} else { } else {
console.warn('DevTools theme ' + this.props.theme + ' not found, defaulting to ocean'); console.warn('DevTools theme ' + this.props.theme + ' not found, defaulting to ocean');
theme = themes.ocean theme = themes.ocean;
} }
} else { } else {
theme = this.props.theme; theme = this.props.theme;

View File

@ -8,9 +8,9 @@ const styles = {
paddingRight: 6, paddingRight: 6,
marginTop: 2, marginTop: 2,
display: 'inline-block', display: 'inline-block',
fontSize: "0.8em" fontSize: '0.8em'
}
} }
};
export default class LogMonitorButton extends React.Component { export default class LogMonitorButton extends React.Component {
constructor(props) { constructor(props) {
@ -18,7 +18,7 @@ export default class LogMonitorButton extends React.Component {
this.state = { this.state = {
hovered: false, hovered: false,
active: false active: false
} };
} }
handleMouseEnter() { handleMouseEnter() {
@ -39,7 +39,7 @@ export default class LogMonitorButton extends React.Component {
render() { render() {
let style = { let style = {
...styles.base, ...styles.base
}; };
if (this.state.hovered) { if (this.state.hovered) {
style = { style = {

View File

@ -1,6 +1,6 @@
import React, { PropTypes } from 'react'; import React, { PropTypes } from 'react';
import JSONTree from './JSONTree'; import JSONTree from './JSONTree';
import LogMonitorEntryAction from "./LogMonitorEntryAction"; import LogMonitorEntryAction from './LogMonitorEntryAction';
function colorFromString(theme, token) { function colorFromString(theme, token) {
const splitToken = token.split(''); const splitToken = token.split('');
@ -32,7 +32,7 @@ export default class LogMonitorEntry {
let errorText = error; let errorText = error;
if (!errorText) { if (!errorText) {
try { try {
return <JSONTree theme={this.props.theme} keyName={'state'} data={this.props.select(state)} /> return <JSONTree theme={this.props.theme} keyName={'state'} data={this.props.select(state)} />;
} catch (err) { } catch (err) {
errorText = 'Error selecting state.'; errorText = 'Error selecting state.';
} }

View File

@ -1,4 +1,4 @@
import React from "react"; import React from 'react';
import JSONTree from './JSONTree'; import JSONTree from './JSONTree';
const styles = { const styles = {
@ -6,7 +6,7 @@ const styles = {
borderTopWidth: 1, borderTopWidth: 1,
borderBottomWidth: 1, borderBottomWidth: 1,
borderTopStyle: 'solid', borderTopStyle: 'solid',
borderBottomStyle: 'solid', borderBottomStyle: 'solid'
}, },
actionBar: { actionBar: {
paddingTop: 4, paddingTop: 4,
@ -18,15 +18,18 @@ const styles = {
backgroundColor: '#252c33', backgroundColor: '#252c33',
paddingLeft: 15 paddingLeft: 15
} }
} };
export default class LogMonitorAction extends React.Component { export default class LogMonitorAction extends React.Component {
renderPayload(payload) { renderPayload(payload) {
return ( return (
<div style={styles.payload}> <div style={styles.payload}>
{ Object.keys(payload).length > 0 ? <JSONTree theme={this.props.theme} keyName={'payload'} data={payload}/> : "" } { Object.keys(payload).length > 0 ? <JSONTree theme={this.props.theme} keyName={'payload'} data={payload}/> : '' }
</div> </div>
); );
} }
render() { render() {
const { type, ...payload } = this.props.action; const { type, ...payload } = this.props.action;
return ( return (

View File

@ -1,2 +1,2 @@
export { default as ocean } from "./ocean"; export { default as ocean } from './ocean';
export { default as monokai } from "./monokai"; export { default as monokai } from './monokai';

View File

@ -1,20 +1,20 @@
export default { export default {
scheme: "Monokai", scheme: 'Monokai',
author: "Wimer Hazenberg (http://www.monokai.nl)", author: 'Wimer Hazenberg (http://www.monokai.nl)',
base00: "#272822", base00: '#272822',
base01: "#383830", base01: '#383830',
base02: "#49483e", base02: '#49483e',
base03: "#75715e", base03: '#75715e',
base04: "#a59f85", base04: '#a59f85',
base05: "#f8f8f2", base05: '#f8f8f2',
base06: "#f5f4f1", base06: '#f5f4f1',
base07: "#f9f8f5", base07: '#f9f8f5',
base08: "#f92672", base08: '#f92672',
base09: "#fd971f", base09: '#fd971f',
base0A: "#f4bf75", base0A: '#f4bf75',
base0B: "#a6e22e", base0B: '#a6e22e',
base0C: "#a1efe4", base0C: '#a1efe4',
base0D: "#66d9ef", base0D: '#66d9ef',
base0E: "#ae81ff", base0E: '#ae81ff',
base0F: "#cc6633" base0F: '#cc6633'
}; };

View File

@ -17,4 +17,4 @@ export default {
base0D: '#8fa1b3', base0D: '#8fa1b3',
base0E: '#b48ead', base0E: '#b48ead',
base0F: '#ab7967' base0F: '#ab7967'
} };