summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-09-29 09:40:17 +0200
committerGitHub <noreply@github.com>2021-09-29 09:40:17 +0200
commitb1237b5caca9c9193b63698d9a05f13e11e53860 (patch)
treef4bb1042de01dffa6e2e9805414a905c81fa59ee
parentf410852f9c18a6d72906fdce66a96746dbab1604 (diff)
parent23b51a1708e257b5962c0179a818513221ad98b6 (diff)
Merge pull request #52926 from akien-mga/js-acorn-emscripten-1.39.9
-rw-r--r--platform/javascript/.eslintrc.js8
-rw-r--r--platform/javascript/js/libs/library_godot_audio.js2
2 files changed, 9 insertions, 1 deletions
diff --git a/platform/javascript/.eslintrc.js b/platform/javascript/.eslintrc.js
index 0ff9d67d26..2c81f1f02d 100644
--- a/platform/javascript/.eslintrc.js
+++ b/platform/javascript/.eslintrc.js
@@ -39,5 +39,13 @@ module.exports = {
// Closure compiler (exported properties)
"quote-props": ["error", "consistent"],
"dot-notation": "off",
+ // No comma dangle for functions (it's madness, and ES2017)
+ "comma-dangle": ["error", {
+ "arrays": "always-multiline",
+ "objects": "always-multiline",
+ "imports": "always-multiline",
+ "exports": "always-multiline",
+ "functions": "never"
+ }],
}
};
diff --git a/platform/javascript/js/libs/library_godot_audio.js b/platform/javascript/js/libs/library_godot_audio.js
index f6010fd12a..6cbb0567f4 100644
--- a/platform/javascript/js/libs/library_godot_audio.js
+++ b/platform/javascript/js/libs/library_godot_audio.js
@@ -229,7 +229,7 @@ const GodotAudioWorklet = {
'godot-processor',
{
'outputChannelCount': [channels],
- },
+ }
);
return Promise.resolve();
});