beremiz: comparison svghmi/gen_index

equal deleted inserted replaced

-:7b1db17287b6
+:dffade5c83d3
 function "scripts"
 {
 | //(function(){
 |
+| id = idstr => document.getElementById(idstr);
+|
 | var hmi_hash = [«$hmitree/@hash»];
 /* TODO re-enable
 ||
 function evaluate_js_from_descriptions() {
 |         «$hmitree_match/@index»`if "position()!=last()" > ,`
 }
 }
 }
 |     ],
-|     element: document.getElementById("«@id»"),
+|     element: id("«@id»"),
 apply "$widget", mode="widget_defs" with "hmi_element",".";
 | }`if "position()!=last()" > ,`
 }
 | }
 |
 }
 | ]
 |
+| var detachable_elements = {
+foreach "$detachable_elements"{
+|     "«@id»" : {element: id("«@id»"), parent:id("«../@id»")}`if "position()!=last()" > ,`
+}
+| }
+|
 | var page_desc = {
 foreach "$hmi_pages" {
 const "desc", "func:parselabel(@inkscape:label)/widget";
 const "page", ".";
 const "page_all_elements", "func:all_related_elements($page)";
 const "all_page_ids","$page_all_elements[@id = $hmi_elements/@id and @id != $page/@id]/@id";
-const "shorter_list", "func:sumarized_elements($page_all_elements)";
+const "required_detachables", "func:sumarized_elements($page_all_elements)";
 |     "«$desc/arg[1]/@value»": {
 |         widget: hmi_widgets["«@id»"],
 |         bbox: [«$p/@x», «$p/@y», «$p/@w», «$p/@h»],
 |         widgets: [
 foreach "$all_page_ids" {
 |             hmi_widgets["«.»"]`if "position()!=last()" > ,`
 }
 |         ],
-|         required_elements: [
+|         required_detachables: [
-foreach "$shorter_list" {
+foreach "$required_detachables" {
-|             "«@id»",
+|             detachable_elements["«@id»"]`if "position()!=last()" > ,`
 }
 |         ]
 |     }`if "position()!=last()" > ,`
 }
 | }
 |
 | var default_page = "«$default_page»";
-| var svg_root = document.getElementById("«$svg_root_id»");
+| var svg_root = id("«$svg_root_id»");
 include text svghmi.js
 | //})();
 }
 // template "*", mode="code_from_descs" {
 warning > «$widget_type» widget must have a «$name» element
 }
 // otherwise produce nothing
 }
 otherwise {
-| «$name»_elt: document.getElementById("«$elt_id»"),
+| «$name»_elt: id("«$elt_id»"),
 }
 }
 }
 }
 |     this.value_elt.textContent = String(value);
 | },
 const "edit_elt_id","$hmi_element/*[@inkscape:label='edit'][1]/@id";
 | init: function() {
 if "$edit_elt_id" {
-|     document.getElementById("«$edit_elt_id»").addEventListener(
+|     id("«$edit_elt_id»").addEventListener(
 |         "click",
 |         evt => alert('XXX TODO : Edit value'));
 }
 foreach "$hmi_element/*[regexp:test(@inkscape:label,'^[=+\-].+')]" {
-|     document.getElementById("«@id»").addEventListener(
+|     id("«@id»").addEventListener(
 |         "click",
 |         evt => {let new_val = change_hmi_value(this.indexes[0], "«func:escape_quotes(@inkscape:label)»");
 |                 this.value_elt.textContent = String(new_val);});
 /* could gray out value until refreshed */
 }
 | choices: [
 const "regex",!"'^(\"[^\"].*\"|\-?[0-9]+)(#.*)?$'"!;
 foreach "$hmi_element/*[regexp:test(@inkscape:label,$regex)]" {
 const "literal", "regexp:match(@inkscape:label,$regex)[2]";
 |     {
-|         elt:document.getElementById("«@id»"),
+|         elt:id("«@id»"),
 |         style:"«@style»",
 |         value:«$literal»
 |     }`if "position()!=last()" > ,`
 }
 | ],

branch	svghmi
changeset 2847	dffade5c83d3
parent 2846	7b1db17287b6
child 2848	c525b1083653