From 115a31c9baff9907694c9f1d8c53dcc1e9fbb664 Mon Sep 17 00:00:00 2001 From: cle1000 Date: Thu, 27 Apr 2017 10:54:21 +0200 Subject: change import of prop-types --- web/src/js/components/ContentView.jsx | 7 ++++--- web/src/js/components/ContentView/CodeEditor.jsx | 3 ++- web/src/js/components/ContentView/ContentLoader.jsx | 3 ++- web/src/js/components/ContentView/ContentViewOptions.jsx | 7 ++++--- web/src/js/components/ContentView/ContentViews.jsx | 5 +++-- web/src/js/components/ContentView/DownloadContentButton.jsx | 2 +- web/src/js/components/ContentView/ShowFullContentButton.jsx | 3 ++- web/src/js/components/ContentView/UploadContentButton.jsx | 4 ++-- web/src/js/components/ContentView/ViewSelector.jsx | 3 ++- web/src/js/components/EventLog.jsx | 3 ++- web/src/js/components/EventLog/EventList.jsx | 3 ++- web/src/js/components/FlowTable.jsx | 3 ++- web/src/js/components/FlowTable/FlowRow.jsx | 3 ++- web/src/js/components/FlowTable/FlowTableHead.jsx | 7 ++++--- web/src/js/components/FlowView/Headers.jsx | 3 ++- web/src/js/components/FlowView/Messages.jsx | 3 ++- web/src/js/components/FlowView/Nav.jsx | 3 ++- web/src/js/components/FlowView/ToggleEdit.jsx | 3 ++- web/src/js/components/Footer.jsx | 3 ++- web/src/js/components/Header.jsx | 3 ++- web/src/js/components/Header/FileMenu.jsx | 3 ++- web/src/js/components/Header/FilterInput.jsx | 3 ++- web/src/js/components/Header/FlowMenu.jsx | 3 ++- web/src/js/components/Header/MainMenu.jsx | 3 ++- web/src/js/components/Header/MenuToggle.jsx | 2 +- web/src/js/components/Header/OptionMenu.jsx | 3 ++- web/src/js/components/MainView.jsx | 3 ++- web/src/js/components/Prompt.jsx | 3 ++- web/src/js/components/ProxyApp.jsx | 3 ++- web/src/js/components/ValueEditor/ValidateEditor.jsx | 3 ++- web/src/js/components/ValueEditor/ValueEditor.jsx | 3 ++- web/src/js/components/common/Button.jsx | 3 ++- web/src/js/components/common/Dropdown.jsx | 3 ++- web/src/js/components/common/FileChooser.jsx | 3 ++- web/src/js/components/common/ToggleButton.jsx | 3 ++- web/src/js/components/common/ToggleInputButton.jsx | 3 ++- web/src/js/filt/filt.js | 2 +- 37 files changed, 78 insertions(+), 45 deletions(-) (limited to 'web/src') diff --git a/web/src/js/components/ContentView.jsx b/web/src/js/components/ContentView.jsx index 398438ab..a79bf9e5 100644 --- a/web/src/js/components/ContentView.jsx +++ b/web/src/js/components/ContentView.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import * as ContentViews from './ContentView/ContentViews' import * as MetaViews from './ContentView/MetaViews' @@ -11,8 +12,8 @@ ContentView.propTypes = { // It may seem a bit weird at the first glance: // Every view takes the flow and the message as props, e.g. // - flow: React.PropTypes.object.isRequired, - message: React.PropTypes.object.isRequired, + flow: PropTypes.object.isRequired, + message: PropTypes.object.isRequired, } ContentView.isContentTooLarge = msg => msg.contentLength > 1024 * 1024 * (ContentViews.ViewImage.matches(msg) ? 10 : 0.2) diff --git a/web/src/js/components/ContentView/CodeEditor.jsx b/web/src/js/components/ContentView/CodeEditor.jsx index 8afc128f..f5961447 100644 --- a/web/src/js/components/ContentView/CodeEditor.jsx +++ b/web/src/js/components/ContentView/CodeEditor.jsx @@ -1,4 +1,5 @@ -import React, {PropTypes} from 'react' +import React from 'react' +import PropTypes from 'prop-types' import Codemirror from 'react-codemirror'; diff --git a/web/src/js/components/ContentView/ContentLoader.jsx b/web/src/js/components/ContentView/ContentLoader.jsx index e7a6f379..4cafde28 100644 --- a/web/src/js/components/ContentView/ContentLoader.jsx +++ b/web/src/js/components/ContentView/ContentLoader.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import { MessageUtils } from '../../flow/utils.js' export default View => class extends React.Component { diff --git a/web/src/js/components/ContentView/ContentViewOptions.jsx b/web/src/js/components/ContentView/ContentViewOptions.jsx index 1ec9013e..e3cc39cd 100644 --- a/web/src/js/components/ContentView/ContentViewOptions.jsx +++ b/web/src/js/components/ContentView/ContentViewOptions.jsx @@ -1,12 +1,13 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import ViewSelector from './ViewSelector' import UploadContentButton from './UploadContentButton' import DownloadContentButton from './DownloadContentButton' ContentViewOptions.propTypes = { - flow: React.PropTypes.object.isRequired, - message: React.PropTypes.object.isRequired, + flow: PropTypes.object.isRequired, + message: PropTypes.object.isRequired, } function ContentViewOptions({ flow, message, uploadContent, readonly, contentViewDescription }) { diff --git a/web/src/js/components/ContentView/ContentViews.jsx b/web/src/js/components/ContentView/ContentViews.jsx index db239195..136188d4 100644 --- a/web/src/js/components/ContentView/ContentViews.jsx +++ b/web/src/js/components/ContentView/ContentViews.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes, Component } from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import { setContentViewDescription, setContent } from '../../ducks/ui/flow' import ContentLoader from './ContentLoader' @@ -21,7 +22,7 @@ function ViewImage({ flow, message }) { } Edit.propTypes = { - content: React.PropTypes.string.isRequired, + content: PropTypes.string.isRequired, } function Edit({ content, onChange }) { diff --git a/web/src/js/components/ContentView/DownloadContentButton.jsx b/web/src/js/components/ContentView/DownloadContentButton.jsx index 3f11f909..447db211 100644 --- a/web/src/js/components/ContentView/DownloadContentButton.jsx +++ b/web/src/js/components/ContentView/DownloadContentButton.jsx @@ -1,5 +1,5 @@ import { MessageUtils } from "../../flow/utils" -import { PropTypes } from 'react' +import PropTypes from 'prop-types' DownloadContentButton.propTypes = { flow: PropTypes.object.isRequired, diff --git a/web/src/js/components/ContentView/ShowFullContentButton.jsx b/web/src/js/components/ContentView/ShowFullContentButton.jsx index fd68991e..fd627ad9 100644 --- a/web/src/js/components/ContentView/ShowFullContentButton.jsx +++ b/web/src/js/components/ContentView/ShowFullContentButton.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import { connect } from 'react-redux' import { render } from 'react-dom'; import Button from '../common/Button'; diff --git a/web/src/js/components/ContentView/UploadContentButton.jsx b/web/src/js/components/ContentView/UploadContentButton.jsx index de349af4..0021593f 100644 --- a/web/src/js/components/ContentView/UploadContentButton.jsx +++ b/web/src/js/components/ContentView/UploadContentButton.jsx @@ -1,4 +1,4 @@ -import { PropTypes } from 'react' +import PropTypes from 'prop-types' import FileChooser from '../common/FileChooser' UploadContentButton.propTypes = { @@ -6,7 +6,7 @@ UploadContentButton.propTypes = { } export default function UploadContentButton({ uploadContent }) { - + return (
diff --git a/web/src/js/components/common/FileChooser.jsx b/web/src/js/components/common/FileChooser.jsx index d59d2d6d..f4607c8b 100644 --- a/web/src/js/components/common/FileChooser.jsx +++ b/web/src/js/components/common/FileChooser.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' FileChooser.propTypes = { icon: PropTypes.string, diff --git a/web/src/js/components/common/ToggleButton.jsx b/web/src/js/components/common/ToggleButton.jsx index 6027728b..925d3c39 100644 --- a/web/src/js/components/common/ToggleButton.jsx +++ b/web/src/js/components/common/ToggleButton.jsx @@ -1,4 +1,5 @@ -import React, { PropTypes } from 'react' +import React from 'react' +import PropTypes from 'prop-types' ToggleButton.propTypes = { checked: PropTypes.bool.isRequired, diff --git a/web/src/js/components/common/ToggleInputButton.jsx b/web/src/js/components/common/ToggleInputButton.jsx index 5fa24c10..2607fb66 100644 --- a/web/src/js/components/common/ToggleInputButton.jsx +++ b/web/src/js/components/common/ToggleInputButton.jsx @@ -1,4 +1,5 @@ -import React, { Component, PropTypes } from 'react' +import React, { Component } from 'react' +import PropTypes from 'prop-types' import classnames from 'classnames' import { Key } from '../../utils' diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js index 2252f957..26058649 100644 --- a/web/src/js/filt/filt.js +++ b/web/src/js/filt/filt.js @@ -1953,7 +1953,7 @@ module.exports = (function() { function domain(regex){ regex = new RegExp(regex, "i"); function domainFilter(flow){ - return flow.request && regex.test(flow.request.host); + return flow.request && (regex.test(flow.request.host) || regex.test(flow.request.pretty_host)); } domainFilter.desc = "domain matches " + regex; return domainFilter; -- cgit v1.2.3