kylefang/mitmproxy
1
0
Fork 0
mirror of https://github.com/zhigang1992/mitmproxy.git synced 2026-04-28 12:15:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

web: fixes

Browse Source
This commit is contained in:
Maximilian Hils
2014-11-27 02:34:03 +01:00
parent e41c0be293
commit 9eecc8d6e2
3 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libmproxy/web/static/js/app.js
View File

@@ -441,38 +441,46 @@ SortByInsertionOrder.prototype.key = function (flow) {
var default_sort = (new SortByInsertionOrder()).key;
function FlowView(store, filt, sort) {
function FlowView(store, filt, sortfun) {
EventEmitter.call(this);
filt = filt || function (flow) {
return true;
};
sort = sort || default_sort;
sortfun = sortfun || default_sort;
this.store = store;
this.store._views.push(this);
this.recalculate(this.store._flow_list, filt, sort);
this.recalculate(this.store._flow_list, filt, sortfun);
}
_.extend(FlowView.prototype, EventEmitter.prototype, {
close: function () {
this.store._views = _.without(this.store._views, this);
},
recalculate: function (flows, filt, sort) {
recalculate: function (flows, filt, sortfun) {
if (filt) {
this.filt = filt;
}
if (sort) {
this.sort = sort;
if (sortfun) {
this.sortfun = sortfun;
}
//Ugly workaround: Call .sortfun() for each flow once in order,
//so that SortByInsertionOrder make sense.
var i = flows.length;
while(i--){
this.sortfun(flows[i]);
}
this.flows = flows.filter(this.filt);
this.flows.sort(function (a, b) {
return this.sort(a) - this.sort(b);
return this.sortfun(b) - this.sortfun(a);
}.bind(this));
this.emit("recalculate");
},
add: function (flow) {
if (this.filt(flow)) {
var idx = _.sortedIndex(this.flows, flow, this.sort);
var idx = _.sortedIndex(this.flows, flow, this.sortfun);
if (idx === this.flows.length) { //happens often, .push is way faster.
this.flows.push(flow);
} else {
@@ -497,7 +505,7 @@ _.extend(FlowView.prototype, EventEmitter.prototype, {
} else if (!this.filt(flow)) {
this.remove(flow.id);
} else {
if (this.sort(this.flows[idx]) !== this.sort(flow)) { //sortpos has changed
if (this.sortfun(this.flows[idx]) !== this.sortfun(flow)) { //sortpos has changed
this.remove(this.flows[idx]);
this.add(flow);
} else {
@@ -1367,18 +1375,18 @@ var MainView = React.createClass({displayName: 'MainView',
this.replaceWith("flows");
}
},
selectFlowRelative: function (i) {
selectFlowRelative: function (shift) {
var flows = this.state.view.flows;
var index;
if (!this.getParams().flowId) {
if (i > 0) {
if (shift > 0) {
index = flows.length - 1;
} else {
index = 0;
}
} else {
i = flows.length;
var currFlowId = this.getParams().flowId;
var i = flows.length;
while (i--) {
if (flows[i].id === currFlowId) {
index = i;
@@ -1386,7 +1394,7 @@ var MainView = React.createClass({displayName: 'MainView',
}
}
index = Math.min(
Math.max(0, index + i),
Math.max(0, index + shift),
flows.length - 1);
}
this.selectFlow(flows[index]);

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

@@ -51,18 +51,18 @@ var MainView = React.createClass({
this.replaceWith("flows");
}
},
selectFlowRelative: function (i) {
selectFlowRelative: function (shift) {
var flows = this.state.view.flows;
var index;
if (!this.getParams().flowId) {
if (i > 0) {
if (shift > 0) {
index = flows.length - 1;
} else {
index = 0;
}
} else {
i = flows.length;
var currFlowId = this.getParams().flowId;
var i = flows.length;
while (i--) {
if (flows[i].id === currFlowId) {
index = i;
@@ -70,7 +70,7 @@ var MainView = React.createClass({
}
}
index = Math.min(
Math.max(0, index + i),
Math.max(0, index + shift),
flows.length - 1);
}
this.selectFlow(flows[index]);

26
web/src/js/stores/flowstore.js
View File

@@ -104,38 +104,46 @@ SortByInsertionOrder.prototype.key = function (flow) {
var default_sort = (new SortByInsertionOrder()).key;
function FlowView(store, filt, sort) {
function FlowView(store, filt, sortfun) {
EventEmitter.call(this);
filt = filt || function (flow) {
return true;
};
sort = sort || default_sort;
sortfun = sortfun || default_sort;
this.store = store;
this.store._views.push(this);
this.recalculate(this.store._flow_list, filt, sort);
this.recalculate(this.store._flow_list, filt, sortfun);
}
_.extend(FlowView.prototype, EventEmitter.prototype, {
close: function () {
this.store._views = _.without(this.store._views, this);
},
recalculate: function (flows, filt, sort) {
recalculate: function (flows, filt, sortfun) {
if (filt) {
this.filt = filt;
}
if (sort) {
this.sort = sort;
if (sortfun) {
this.sortfun = sortfun;
}
//Ugly workaround: Call .sortfun() for each flow once in order,
//so that SortByInsertionOrder make sense.
var i = flows.length;
while(i--){
this.sortfun(flows[i]);
}
this.flows = flows.filter(this.filt);
this.flows.sort(function (a, b) {
return this.sort(a) - this.sort(b);
return this.sortfun(b) - this.sortfun(a);
}.bind(this));
this.emit("recalculate");
},
add: function (flow) {
if (this.filt(flow)) {
var idx = _.sortedIndex(this.flows, flow, this.sort);
var idx = _.sortedIndex(this.flows, flow, this.sortfun);
if (idx === this.flows.length) { //happens often, .push is way faster.
this.flows.push(flow);
} else {
@@ -160,7 +168,7 @@ _.extend(FlowView.prototype, EventEmitter.prototype, {
} else if (!this.filt(flow)) {
this.remove(flow.id);
} else {
if (this.sort(this.flows[idx]) !== this.sort(flow)) { //sortpos has changed
if (this.sortfun(this.flows[idx]) !== this.sortfun(flow)) { //sortpos has changed
this.remove(this.flows[idx]);
this.add(flow);
} else {