Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-01-30 14:58:38 +00:00
Code Issues Projects Releases Wiki Activity

web: fix bugs

Browse Source
This commit is contained in:
Maximilian Hils 2015-03-21 21:55:02 +01:00
parent 8725d50d03
commit ac5d74d42c
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -421,6 +421,7 @@ module.exports = {
ConnectionActions: ConnectionActions,
FlowActions: FlowActions,
StoreCmds: StoreCmds,
SettingsActions: SettingsActions,
Query: Query
};
@ -622,6 +623,7 @@ var common = require("./common.js");
var Query = require("../actions.js").Query;
var VirtualScrollMixin = require("./virtualscroll.js");
var views = require("../store/view.js");
var _ = require("lodash");
var LogMessage = React.createClass({displayName: "LogMessage",
render: function () {
@ -775,7 +777,7 @@ var EventLog = React.createClass({displayName: "EventLog",
module.exports = EventLog;
},{"../actions.js":2,"../store/view.js":19,"./common.js":4,"./virtualscroll.js":13,"react":"react"}],6:[function(require,module,exports){
},{"../actions.js":2,"../store/view.js":19,"./common.js":4,"./virtualscroll.js":13,"lodash":"lodash","react":"react"}],6:[function(require,module,exports){
var React = require("react");
var _ = require("lodash");
@ -1774,7 +1776,7 @@ var MainMenu = React.createClass({displayName: "MainMenu",
this.setQuery(d);
},
onInterceptChange: function (val) {
SettingsActions.update({intercept: val});
actions.SettingsActions.update({intercept: val});
},
render: function () {
var filter = this.getQuery()[Query.FILTER] || "";
@ -2196,6 +2198,8 @@ var MainView = React.createClass({displayName: "MainView",
actions.FlowActions.revert(flow);
}
break;
case toputils.Key.SHIFT:
break;
default:
console.debug("keydown", e.keyCode);
return;
@ -4514,8 +4518,6 @@ var default_filt = function (elem) {
function StoreView(store, filt, sortfun) {
EventEmitter.call(this);
filt = filt || default_filt;
sortfun = sortfun || default_sort;
this.store = store;
@ -4539,10 +4541,10 @@ _.extend(StoreView.prototype, EventEmitter.prototype, {
this.store.removeListener("recalculate", this.recalculate);
},
recalculate: function (filt, sortfun) {
filt = filt || default_filt;
sortfun = sortfun || default_sort;
filt = filt || this.filt || default_filt;
sortfun = sortfun || this.sortfun || default_sort;
filt = filt.bind(this);
sortfun = sortfun.bind(this)
sortfun = sortfun.bind(this);
this.filt = filt;
this.sortfun = sortfun;
@ -4633,6 +4635,7 @@ var Key = {
TAB: 9,
SPACE: 32,
BACKSPACE: 8,
SHIFT: 16
};
// Add A-Z
for (var i = 65; i <= 90; i++) {

1
web/src/js/actions.js
View File

@ -117,5 +117,6 @@ module.exports = {
ConnectionActions: ConnectionActions,
FlowActions: FlowActions,
StoreCmds: StoreCmds,
SettingsActions: SettingsActions,
Query: Query
};

1
web/src/js/components/eventlog.js
View File

@ -3,6 +3,7 @@ var common = require("./common.js");
var Query = require("../actions.js").Query;
var VirtualScrollMixin = require("./virtualscroll.js");
var views = require("../store/view.js");
var _ = require("lodash");
var LogMessage = React.createClass({
render: function () {

2
web/src/js/components/header.js
View File

@ -173,7 +173,7 @@ var MainMenu = React.createClass({
this.setQuery(d);
},
onInterceptChange: function (val) {
SettingsActions.update({intercept: val});
actions.SettingsActions.update({intercept: val});
},
render: function () {
var filter = this.getQuery()[Query.FILTER] || "";

2
web/src/js/components/mainview.js
View File

@ -203,6 +203,8 @@ var MainView = React.createClass({
actions.FlowActions.revert(flow);
}
break;
case toputils.Key.SHIFT:
break;
default:
console.debug("keydown", e.keyCode);
return;

8
web/src/js/store/view.js
View File

@ -14,8 +14,6 @@ var default_filt = function (elem) {
function StoreView(store, filt, sortfun) {
EventEmitter.call(this);
filt = filt || default_filt;
sortfun = sortfun || default_sort;
this.store = store;
@ -39,10 +37,10 @@ _.extend(StoreView.prototype, EventEmitter.prototype, {
this.store.removeListener("recalculate", this.recalculate);
},
recalculate: function (filt, sortfun) {
filt = filt || default_filt;
sortfun = sortfun || default_sort;
filt = filt || this.filt || default_filt;
sortfun = sortfun || this.sortfun || default_sort;
filt = filt.bind(this);
sortfun = sortfun.bind(this)
sortfun = sortfun.bind(this);
this.filt = filt;
this.sortfun = sortfun;

1
web/src/js/utils.js
View File

@ -15,6 +15,7 @@ var Key = {
TAB: 9,
SPACE: 32,
BACKSPACE: 8,
SHIFT: 16
};
// Add A-Z
for (var i = 65; i <= 90; i++) {