aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2017-03-19 14:47:50 +0100
committerGitHub <noreply@github.com>2017-03-19 14:47:50 +0100
commit92e33589159ee94df831fc0f0b2084854a6c44ae (patch)
tree918ae105d66917f609d9ad8c3d02f88663f35a17 /web/src/js
parent1b330ba453f9829c300a65d6eb2110cfb71728f4 (diff)
parent125ae2d8f92ae2005fb8dc058310e22fd9db9e15 (diff)
downloadmitmproxy-92e33589159ee94df831fc0f0b2084854a6c44ae.tar.gz
mitmproxy-92e33589159ee94df831fc0f0b2084854a6c44ae.tar.bz2
mitmproxy-92e33589159ee94df831fc0f0b2084854a6c44ae.zip
Merge pull request #2182 from syahn/fix-#2134
Fix #2134
Diffstat (limited to 'web/src/js')
-rw-r--r--web/src/js/components/EventLog.jsx2
-rw-r--r--web/src/js/components/EventLog/EventList.jsx7
-rw-r--r--web/src/js/ducks/eventLog.js2
3 files changed, 8 insertions, 3 deletions
diff --git a/web/src/js/components/EventLog.jsx b/web/src/js/components/EventLog.jsx
index 1a449511..3e0430db 100644
--- a/web/src/js/components/EventLog.jsx
+++ b/web/src/js/components/EventLog.jsx
@@ -55,7 +55,7 @@ class EventLog extends Component {
<div onMouseDown={this.onDragStart}>
Eventlog
<div className="pull-right">
- {['debug', 'info', 'web'].map(type => (
+ {['debug', 'info', 'web', 'warn', 'error'].map(type => (
<ToggleButton key={type} text={type} checked={filters[type]} onToggle={() => toggleFilter(type)}/>
))}
<i onClick={close} className="fa fa-close"></i>
diff --git a/web/src/js/components/EventLog/EventList.jsx b/web/src/js/components/EventLog/EventList.jsx
index d0b036e7..14f2b5b2 100644
--- a/web/src/js/components/EventLog/EventList.jsx
+++ b/web/src/js/components/EventLog/EventList.jsx
@@ -83,7 +83,12 @@ class EventLogList extends Component {
}
function LogIcon({ event }) {
- const icon = { web: 'html5', debug: 'bug' }[event.level] || 'info'
+ const icon = {
+ web: 'html5',
+ debug: 'bug',
+ warn: 'exclamation-triangle',
+ error: 'ban'
+ }[event.level] || 'info'
return <i className={`fa fa-fw fa-${icon}`}></i>
}
diff --git a/web/src/js/ducks/eventLog.js b/web/src/js/ducks/eventLog.js
index 73eaf2e8..8f9ec34d 100644
--- a/web/src/js/ducks/eventLog.js
+++ b/web/src/js/ducks/eventLog.js
@@ -8,7 +8,7 @@ export const TOGGLE_FILTER = 'EVENTS_TOGGLE_FILTER'
const defaultState = {
visible: false,
- filters: { debug: false, info: true, web: true },
+ filters: { debug: false, info: true, web: true, warn: true, error: true },
...reduceStore(undefined, {}),
}