Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-23 00:01:36 +00:00
Code Issues Projects Releases Wiki Activity

fix mitmproxy/mitmweb#25

Browse Source
This commit is contained in:
Maximilian Hils 2016-06-26 02:17:07 -07:00
parent 370e6caedc
commit ed9a72553d
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/js/components/ContentView.jsx
View File

@ -1,7 +1,7 @@
import React, { Component, PropTypes } from 'react'
import { MessageUtils } from '../flow/utils.js'
import { ViewAuto, ViewImage } from './ContentView/ContentViews'
import * as ContentErrors from './ContentView/ContentErrors'
import * as MetaViews from './ContentView/MetaViews'
import ContentLoader from './ContentView/ContentLoader'
import ViewSelector from './ContentView/ViewSelector'
@ -45,15 +45,15 @@ export default class ContentView extends Component {
const { displayLarge, View } = this.state
if (message.contentLength === 0) {
return <ContentErrors.ContentEmpty {...this.props}/>
return <MetaViews.ContentEmpty {...this.props}/>
}
if (message.contentLength === null) {
return <ContentErrors.ContentMissing {...this.props}/>
return <MetaViews.ContentMissing {...this.props}/>
}
if (!displayLarge && this.isContentTooLarge(message)) {
return <ContentErrors.ContentTooLarge {...this.props} onClick={this.displayLarge}/>
return <MetaViews.ContentTooLarge {...this.props} onClick={this.displayLarge}/>
}
return (

1
web/src/js/components/ContentView/ContentErrors.jsx → web/src/js/components/ContentView/MetaViews.jsx
View File

@ -1,5 +1,4 @@
import React from 'react'
import { ViewImage } from './ContentViews'
import {formatSize} from '../../utils.js'
export function ContentEmpty({ flow, message }) {

8
web/src/js/components/FlowView/Details.jsx
View File

@ -28,13 +28,9 @@ export function ConnectionInfo({ conn }) {
<td>Address:</td>
<td>{conn.address.address.join(':')}</td>
</tr>
{conn.sni ? (
<tr key="sni"></tr>
) : (
{conn.sni && (
<tr key="sni">
<td>
<abbr title="TLS Server Name Indication">TLS SNI:</abbr>
</td>
<td><abbr title="TLS Server Name Indication">TLS SNI:</abbr></td>
<td>{conn.sni}</td>
</tr>
)}

22
web/src/js/components/Prompt.jsx
View File

@ -36,6 +36,17 @@ export default function Prompt({ prompt, done, options }, context) {
opts.push(opt)
}
function onKeyDown(event) {
event.stopPropagation()
event.preventDefault()
const key = opts.find(opt => Key[opt.key.toUpperCase()] === event.keyCode)
if (!key && event.keyCode !== Key.ESC && event.keyCode !== Key.ENTER) {
return
}
done(key.key || false)
context.returnFocus()
}
return (
<div tabIndex="0" onKeyDown={onKeyDown} className="prompt-dialog">
<div className="prompt-content">
@ -57,15 +68,4 @@ export default function Prompt({ prompt, done, options }, context) {
</div>
</div>
)
function onKeyDown(event) {
event.stopPropagation()
event.preventDefault()
const key = opts.find(opt => Key[opt.key.toUpperCase()] === event.keyCode)
if (!key && event.keyCode !== Key.ESC && event.keyCode !== Key.ENTER) {
return
}
done(key.key || false)
context.returnFocus()
}
}