From 9076defaca9b25749f2526406b6c2d8756f97329 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Fri, 24 Mar 2017 10:49:00 +0100 Subject: [PATCH] Get parse.js in sync with generated code The generated keysymdef.js was recently converted to ES modules, but the generating script was overlooked. --- utils/parse.js | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/utils/parse.js b/utils/parse.js index fd79b12b..d2067db9 100644 --- a/utils/parse.js +++ b/utils/parse.js @@ -80,23 +80,20 @@ var out = "// This file describes mappings from Unicode codepoints to the keysym "// (and optionally, key names) expected by the RFB protocol\n" + "// How this file was generated:\n" + "// " + process.argv.join(" ") + "\n" + -"var keysyms = (function(){\n" + -" \"use strict\";\n" + -" var keynames = {keysyms};\n" + -" var codepoints = {codepoints};\n" + +"var keynames = {keysyms};\n" + +"var codepoints = {codepoints};\n" + "\n" + -" function lookup(k) { return k ? {keysym: k, keyname: keynames ? keynames[k] : k} : undefined; }\n" + -" return {\n" + -" fromUnicode : function(u) {\n" + -" var keysym = codepoints[u];\n" + -" if (keysym === undefined) {\n" + -" keysym = 0x01000000 | u;\n" + -" }\n" + -" return lookup(keysym);\n" + -" },\n" + -" lookup : lookup\n" + -" };\n" + -"})();\n"; +"function lookup(k) { return k ? {keysym: k, keyname: keynames ? keynames[k] : k} : undefined; }\n" + +"export default {\n" + +" fromUnicode : function(u) {\n" + +" var keysym = codepoints[u];\n" + +" if (keysym === undefined) {\n" + +" keysym = 0x01000000 | u;\n" + +" }\n" + +" return lookup(keysym);\n" + +" },\n" + +" lookup : lookup\n" + +"};\n"; out = out.replace('{keysyms}', use_keynames ? JSON.stringify(keysyms) : "null"); out = out.replace('{codepoints}', JSON.stringify(codepoints));