aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--assets/js/ie-emulation-modes-warning.js2
-rw-r--r--js/.eslintrc.json1
2 files changed, 2 insertions, 1 deletions
diff --git a/assets/js/ie-emulation-modes-warning.js b/assets/js/ie-emulation-modes-warning.js
index 7996b9e34..c8f0bcac5 100644
--- a/assets/js/ie-emulation-modes-warning.js
+++ b/assets/js/ie-emulation-modes-warning.js
@@ -26,7 +26,7 @@
// Detects the actual version of IE in use, even if it's in an older-IE emulation mode.
// IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
// @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
- var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')()
+ var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // eslint-disable-line no-new-func
if (jscriptVersion === undefined) {
return 11 // IE11+ not in emulation mode
}
diff --git a/js/.eslintrc.json b/js/.eslintrc.json
index 8f79cbaa2..72029797a 100644
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@@ -58,6 +58,7 @@
}
],
"no-multi-spaces": ["error", {
+ "ignoreEOLComments": true,
"exceptions": {
"AssignmentExpression": true,
"ArrowFunctionExpression": true,