Magic-Mirror/mitmproxy
1
0
Fork 0
mirror of https://github.com/mitmproxy/mitmproxy.git synced 2024-11-29 08:10:37 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "revert to custom EventEmitter, workaround for #504"

Browse Source 
This reverts commit fa8fc64ce0.
This commit is contained in:
Legend Tang 2015-03-06 03:29:15 +08:00
parent fa8fc64ce0
commit b903dd4e4a
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,8 @@
var EventEmitter = require('events').EventEmitter;
var _ = require("lodash");
var utils = require("../utils.js");
function SortByStoreOrder(elem) {
@ -12,7 +15,7 @@ var default_filt = function(elem){
};
function StoreView(store, filt, sortfun) {
utils.EventEmitter.call(this);
EventEmitter.call(this);
filt = filt || default_filt;
sortfun = sortfun || default_sort;
@ -30,7 +33,7 @@ function StoreView(store, filt, sortfun) {
this.recalculate(filt, sortfun);
}
_.extend(StoreView.prototype, utils.EventEmitter.prototype, {
_.extend(StoreView.prototype, EventEmitter.prototype, {
close: function () {
this.store.removeListener("add", this.add);
this.store.removeListener("update", this.update);

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

@ -58,35 +58,6 @@ var formatTimeStamp = function (seconds) {
return ts.replace("T", " ").replace("Z", "");
};
function EventEmitter() {
this.listeners = {};
}
EventEmitter.prototype.emit = function (event) {
if (!(event in this.listeners)) {
return;
}
var args = Array.prototype.slice.call(arguments, 1);
this.listeners[event].forEach(function (listener) {
listener.apply(this, args);
}.bind(this));
};
EventEmitter.prototype.addListener = function (events, f) {
events.split(" ").forEach(function (event) {
this.listeners[event] = this.listeners[event] || [];
this.listeners[event].push(f);
}.bind(this));
};
EventEmitter.prototype.removeListener = function (events, f) {
if (!(events in this.listeners)) {
return false;
}
events.split(" ").forEach(function (event) {
var index = this.listeners[event].indexOf(f);
if (index >= 0) {
this.listeners[event].splice(index, 1);
}
}.bind(this));
};
function getCookie(name) {
var r = document.cookie.match("\\b" + name + "=([^;]*)\\b");
@ -113,7 +84,6 @@ $(document).ajaxError(function (event, jqXHR, ajaxSettings, thrownError) {
});
module.exports = {
EventEmitter: EventEmitter,
formatSize: formatSize,
formatTimeDelta: formatTimeDelta,
formatTimeStamp: formatTimeStamp,