aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/filt/filt.js
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-12-30 21:51:07 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-12-30 21:51:07 +1300
commitbc8687deb5f0f9273fc771e79b070f3b49e39fed (patch)
tree07e67eb7c9f732c0419e57b337c31d2372d12cff /web/src/js/filt/filt.js
parentd2c7411f065435e2b2b62a70447cb01895fe69d1 (diff)
downloadmitmproxy-bc8687deb5f0f9273fc771e79b070f3b49e39fed.tar.gz
mitmproxy-bc8687deb5f0f9273fc771e79b070f3b49e39fed.tar.bz2
mitmproxy-bc8687deb5f0f9273fc771e79b070f3b49e39fed.zip
Basic conversion: browserified web app now works.
Diffstat (limited to 'web/src/js/filt/filt.js')
-rw-r--r--web/src/js/filt/filt.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/web/src/js/filt/filt.js b/web/src/js/filt/filt.js
index 0d93b767..095081ac 100644
--- a/web/src/js/filt/filt.js
+++ b/web/src/js/filt/filt.js
@@ -1,3 +1,4 @@
+/* jshint ignore:start */
Filt = (function() {
/*
* Generated by PEG.js 0.8.0.
@@ -278,11 +279,11 @@ Filt = (function() {
expectedDescs[i] = expected[i].description;
}
- expectedDesc = (expected.length > 1
+ expectedDesc = expected.length > 1
? expectedDescs.slice(0, -1).join(", ")
+ " or "
+ expectedDescs[expected.length - 1]
- : expectedDescs[0]);
+ : expectedDescs[0];
foundDesc = found ? "\"" + stringEscape(found) + "\"" : "end of input";
@@ -1769,4 +1770,7 @@ Filt = (function() {
SyntaxError: SyntaxError,
parse: parse
};
-})(); \ No newline at end of file
+})();
+/* jshint ignore:end */
+
+module.exports = Filt;