From 82b86879d277521efb0dbf85ef2240135003072b Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 10 Mar 2016 12:00:36 +0100 Subject: [PATCH 1/4] ignore netflux since it's ecma6 and not our code --- .jshintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.jshintignore b/.jshintignore index 299e1ad54..29b53f0f4 100644 --- a/.jshintignore +++ b/.jshintignore @@ -11,3 +11,4 @@ www/code/rangy.js storage/kad.js www/common/otaml.js www/common/diffDOM.js +www/common/netflux.js From fb0e82931d023ab1fe4f576568a54d1ebbfd4113 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 10 Mar 2016 11:58:23 +0100 Subject: [PATCH 2/4] correct malformed json --- www/input/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/input/main.js b/www/input/main.js index 9be43e973..c61e312f2 100644 --- a/www/input/main.js +++ b/www/input/main.js @@ -33,7 +33,7 @@ define([ websocketURL: Config.websocketURL, userName: Crypto.rand64(8), channel: key.channel, - key.cryptKey + cryptKey: key.cryptKey }; var rttext = RTText.start(config); From 8e41f4380201bb47e42b8f4d0a3d0a57b90fd1e4 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 10 Mar 2016 14:10:11 +0100 Subject: [PATCH 3/4] ignore netflux socket server since it has ES6 --- .jshintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.jshintignore b/.jshintignore index 29b53f0f4..292d2843a 100644 --- a/.jshintignore +++ b/.jshintignore @@ -12,3 +12,4 @@ storage/kad.js www/common/otaml.js www/common/diffDOM.js www/common/netflux.js +NetFluxWebsocketServer.js From a9f088710c22814744a422f95a610247db232f34 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 10 Mar 2016 14:11:03 +0100 Subject: [PATCH 4/4] also ignore webrtc server --- .jshintignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.jshintignore b/.jshintignore index 292d2843a..b34fb0d40 100644 --- a/.jshintignore +++ b/.jshintignore @@ -13,3 +13,4 @@ www/common/otaml.js www/common/diffDOM.js www/common/netflux.js NetFluxWebsocketServer.js +WebRTCSrv.js