diff options
| author | Aldo Cortesi <aldo@corte.si> | 2016-06-11 16:08:14 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 16:08:14 +1200 |
| commit | 227d762cace09bc315e57644da2135480bf32cb9 (patch) | |
| tree | dd1b458e77d79a8f7867e31f7a352c19e586e129 /web/src/js/ducks | |
| parent | 250b47487aa071e61f0bd2960992e80222103a3a (diff) | |
| parent | 0b241a1da71ef9eb7632fc0e32abcf061dcbd217 (diff) | |
| download | mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.tar.gz mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.tar.bz2 mitmproxy-227d762cace09bc315e57644da2135480bf32cb9.zip | |
Merge branch 'master' into toxfiddle
Diffstat (limited to 'web/src/js/ducks')
| -rw-r--r-- | web/src/js/ducks/flows.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/web/src/js/ducks/flows.js b/web/src/js/ducks/flows.js index 6adde71c..f7a5538a 100644 --- a/web/src/js/ducks/flows.js +++ b/web/src/js/ducks/flows.js @@ -2,7 +2,7 @@ import makeList from "./utils/list" import Filt from "../filt/filt" import {updateViewFilter, updateViewList, updateViewSort} from "./utils/view" import {reverseString} from "../utils.js"; -import * as flow_table_columns from "../components/flowtable-columns.js"; +import * as columns from "../components/FlowTable/FlowColumns"; export const UPDATE_FLOWS = "UPDATE_FLOWS" export const SET_FILTER = "SET_FLOW_FILTER" @@ -32,7 +32,7 @@ function makeFilterFn(filter) { function makeSortFn(sort){ - let column = flow_table_columns[sort.sortColumn]; + let column = columns[sort.sortColumn]; if (!column) return; let sortKeyFun = column.sortKeyFun; @@ -108,4 +108,4 @@ export function selectFlow(flowId) { } -export {updateList as updateFlows, fetchList as fetchFlows}
\ No newline at end of file +export {updateList as updateFlows, fetchList as fetchFlows} |