# HG changeset patch
# User Edouard Tisserant
# Date 1584015354 -3600
# Node ID 901c89c0cc08566d57fe049b2daadd77df2ad333
# Parent 59a855c17aa63818944392aa42bf7a4a7083150f
SVGHMI: unsignificant changes or changes in generated code
diff -r 59a855c17aa6 -r 901c89c0cc08 svghmi/gen_index_xhtml.xslt
--- a/svghmi/gen_index_xhtml.xslt Thu Mar 12 13:14:38 2020 +0100
+++ b/svghmi/gen_index_xhtml.xslt Thu Mar 12 13:15:54 2020 +0100
@@ -33,9 +33,6 @@
HMI_ROOT
- HMI_NODE
-
-
HMI_PLC_STATUS
@@ -43,10 +40,6 @@
-
-
-
-
@@ -147,6 +140,10 @@
+
+
+
+
@@ -176,6 +173,12 @@
+
+
+
+
+
+
@@ -785,8 +788,6 @@
}
- console.log("no page switch");
-
apply_updates();
requestAnimationFrameID = null;
@@ -1359,10 +1360,12 @@
+
- =
+ ="
+ "
@@ -1618,8 +1621,6 @@
on_click: function(evt) {
- console.log(evt);
-
switch_page(this.args[0]);
},
diff -r 59a855c17aa6 -r 901c89c0cc08 svghmi/gen_index_xhtml.ysl2
--- a/svghmi/gen_index_xhtml.ysl2 Thu Mar 12 13:14:38 2020 +0100
+++ b/svghmi/gen_index_xhtml.ysl2 Thu Mar 12 13:15:54 2020 +0100
@@ -69,8 +69,6 @@
noindex > HMI_CURRENT_PAGE
}
const "categories", "exsl:node-set($_categories)";
- const "_indexed_hmitree" apply "$hmitree", mode="index";
- const "indexed_hmitree", "exsl:node-set($_indexed_hmitree)";
// returns all directly or indirectly refered elements
@@ -263,8 +261,12 @@
const "_detachable_elements", "func:detachable_elements($hmi_pages)";
const "detachable_elements", "$_detachable_elements[not(ancestor::*/@id = $_detachable_elements/@id)]";
+
//////////////// HMI Tree Index
+ const "_indexed_hmitree" apply "$hmitree", mode="index";
+ const "indexed_hmitree", "exsl:node-set($_indexed_hmitree)";
+
template "*", mode="index" {
param "index", "0";
param "parentpath", "''";
@@ -822,7 +824,6 @@
template "widget[@type='Jump']", mode="widget_defs" {
param "hmi_element";
| on_click: function(evt) {
- | console.log(evt);
| switch_page(this.args[0]);
| },
| init: function() {
diff -r 59a855c17aa6 -r 901c89c0cc08 svghmi/svghmi.js
--- a/svghmi/svghmi.js Thu Mar 12 13:14:38 2020 +0100
+++ b/svghmi/svghmi.js Thu Mar 12 13:15:54 2020 +0100
@@ -82,7 +82,6 @@
if(current_subscribed_page != current_visible_page){
switch_visible_page(current_subscribed_page);
}
- console.log("no page switch");
apply_updates();
requestAnimationFrameID = null;
}