From f3733ae8d69463e1a071996a80b3f1306ea57973 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Fri, 5 Jan 2024 19:05:01 +0000 Subject: [PATCH] Bug 35718: Remove ES6 warns from JS system preferences To test: 1. Add some JS like this to any of the UserJS system preferences: $(document).ready( function() { let something = 1; const another_thing = 2; let an_arrow_function = (a, b) => a + b; console.log( an_arrow_function(something, another_thing) ); }); 2. Notice the icons and warnings to the left of the line numbers: let is available in ES6 const is available in ES6 arrow_function_syntax is available in ES6 3. APPLY PATCH 4. Try steps 1 and 2 again, the warnings should be gone. 5. Check that the JavaScript still works, in my example it should console.log 3. Signed-off-by: David Nind Signed-off-by: Julian Maurice Signed-off-by: Katrin Fischer (cherry picked from commit 5e3ae14aa0c204a8fa980d574a998f4194523586) Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js index 7823d49d72..2ac7adefac 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/preferences.js @@ -89,6 +89,7 @@ function addExpandHandler() { $(this).hide(); var target = $(this).data("target"); var syntax = $(this).data("syntax"); + var lint_type = syntax === 'javascript'? { 'esversion': 6 } : true; $("#collapse_" + target).show(); if (syntax) { var editor = CodeMirror.fromTextArea(document.getElementById("pref_" + target), { @@ -97,7 +98,7 @@ function addExpandHandler() { lineWrapping: true, viewportMargin: Infinity, gutters: ["CodeMirror-lint-markers"], - lint: true + lint: lint_type, }); editor.on("change", function () { mark_modified.call($("#pref_" + target)[0]); -- 2.39.5