# HG changeset patch # User Edouard Tisserant # Date 1651827723 -7200 # Node ID 2fb9849c67214a5a418f7991c04af276a087f467 # Parent 3f7b4a2009baa135387ea3aee39b60393a45093c SVGHMI: fix syntax error in sprintf.js and force makefile to regen xslt files when sprintf.js changes diff -r 3f7b4a2009ba -r 2fb9849c6721 svghmi/Makefile --- a/svghmi/Makefile Fri May 06 11:01:07 2022 +0200 +++ b/svghmi/Makefile Fri May 06 11:02:03 2022 +0200 @@ -15,9 +15,11 @@ ysl2includes := $(filter-out $(ysl2files), $(wildcard *.ysl2)) xsltfiles := $(patsubst %.ysl2, %.xslt, $(ysl2files)) +jsfiles := svghmi.js sprintf.js + all:$(xsltfiles) -%.xslt: %.ysl2 $(ysl2includes) svghmi.js ../yslt_noindent.yml2 +%.xslt: %.ysl2 $(ysl2includes) $(jsfiles) ../yslt_noindent.yml2 $(yml2path)/yml2c -I $(yml2path):../ $< -o $@.tmp xmlstarlet fo $@.tmp > $@ rm $@.tmp diff -r 3f7b4a2009ba -r 2fb9849c6721 svghmi/sprintf.js --- a/svghmi/sprintf.js Fri May 06 11:01:07 2022 +0200 +++ b/svghmi/sprintf.js Fri May 06 11:02:03 2022 +0200 @@ -95,12 +95,12 @@ see meaning of DateTimeFormat's options "datestyle" and "timestyle" in MDN */ - let [datestyle, timestyle] = [ph.width, ph.precision].map(val => { + let [datestyle, timestyle] = [ph.width, ph.precision].map(val => ({ 1: "short", 2: "medium", 3: "long", 4: "full" - }[val]); + }[val])); if(timestyle === undefined && datestyle === undefined){ timestyle = "short";