beremiz

SVGHMI: update generated XSLT

2022-11-18, Edouard Tisserant
2239f8e3de48
Parents bbcbb1bba9f1
Children 570a738239f4
SVGHMI: update generated XSLT
1 files changed, 44 insertions(+), 26 deletions(-)
  • +44 -26
    svghmi/gen_index_xhtml.xslt
    • --- a/svghmi/gen_index_xhtml.xslt Fri Nov 18 10:40:57 2022 +0100
    +++ b/svghmi/gen_index_xhtml.xslt Fri Nov 18 10:44:56 2022 +0100
    @@ -12128,29 +12128,37 @@
    </xsl:text>
    <xsl:text>
    </xsl:text>
    - <xsl:text>var screensaver_timer = null;
    -</xsl:text>
    - <xsl:text>function reset_screensaver_timer() {
    -</xsl:text>
    - <xsl:text> if(screensaver_timer){
    -</xsl:text>
    - <xsl:text> window.clearTimeout(screensaver_timer);
    + <xsl:text>if(screensaver_delay){
    +</xsl:text>
    + <xsl:text> var screensaver_timer = null;
    +</xsl:text>
    + <xsl:text> function reset_screensaver_timer() {
    +</xsl:text>
    + <xsl:text> if(screensaver_timer){
    +</xsl:text>
    + <xsl:text> window.clearTimeout(screensaver_timer);
    +</xsl:text>
    + <xsl:text> }
    +</xsl:text>
    + <xsl:text> screensaver_timer = window.setTimeout(() =&gt; {
    +</xsl:text>
    + <xsl:text> switch_page("ScreenSaver");
    +</xsl:text>
    + <xsl:text> screensaver_timer = null;
    +</xsl:text>
    + <xsl:text> }, screensaver_delay*1000);
    </xsl:text>
    <xsl:text> }
    </xsl:text>
    - <xsl:text> screensaver_timer = window.setTimeout(() =&gt; {
    -</xsl:text>
    - <xsl:text> switch_page("ScreenSaver");
    -</xsl:text>
    - <xsl:text> screensaver_timer = null;
    -</xsl:text>
    - <xsl:text> }, screensaver_delay*1000);
    + <xsl:text> document.body.addEventListener('pointerdown', reset_screensaver_timer);
    +</xsl:text>
    + <xsl:text> // initialize screensaver
    +</xsl:text>
    + <xsl:text> reset_screensaver_timer();
    </xsl:text>
    <xsl:text>}
    </xsl:text>
    - <xsl:text>if(screensaver_delay)
    -</xsl:text>
    - <xsl:text> document.body.addEventListener('pointerdown', reset_screensaver_timer);
    + <xsl:text>
    </xsl:text>
    <xsl:text>
    </xsl:text>
    @@ -12474,16 +12482,12 @@
    </xsl:text>
    <xsl:text>
    </xsl:text>
    - <xsl:text>// initialize screensaver
    -</xsl:text>
    - <xsl:text>reset_screensaver_timer();
    -</xsl:text>
    - <xsl:text>
    -</xsl:text>
    <xsl:text>var reconnect_delay = 0;
    </xsl:text>
    <xsl:text>var periodic_reconnect_timer;
    </xsl:text>
    + <xsl:text>var force_reconnect = false;
    +</xsl:text>
    <xsl:text>
    </xsl:text>
    <xsl:text>// Once connection established
    @@ -12504,6 +12508,8 @@
    </xsl:text>
    <xsl:text> periodic_reconnect_timer = window.setTimeout(() =&gt; {
    </xsl:text>
    + <xsl:text> force_reconnect = true;
    +</xsl:text>
    <xsl:text> ws.close();
    </xsl:text>
    <xsl:text> periodic_reconnect_timer = null;
    @@ -12540,14 +12546,26 @@
    </xsl:text>
    <xsl:text> ws = null;
    </xsl:text>
    - <xsl:text> // reconect
    -</xsl:text>
    - <xsl:text> // TODO : add visible notification while waiting for reload
    + <xsl:text> // Do not attempt to reconnect immediately in case:
    +</xsl:text>
    + <xsl:text> // - connection was closed by server (PLC stop)
    +</xsl:text>
    + <xsl:text> // - connection was closed locally with an intention to reconnect
    +</xsl:text>
    + <xsl:text> if(evt.code=1000 &amp;&amp; !force_reconnect){
    +</xsl:text>
    + <xsl:text> window.alert("Connection closed by server");
    +</xsl:text>
    + <xsl:text> location.reload();
    +</xsl:text>
    + <xsl:text> }
    </xsl:text>
    <xsl:text> window.setTimeout(create_ws, reconnect_delay);
    </xsl:text>
    <xsl:text> reconnect_delay += 500;
    </xsl:text>
    + <xsl:text> force_reconnect = false;
    +</xsl:text>
    <xsl:text>};
    </xsl:text>
    <xsl:text>