--- a/svghmi/widget_jump.ysl2	Tue Aug 23 12:19:44 2022 +0200
+++ b/svghmi/widget_jump.ysl2	Wed Aug 31 12:16:09 2022 +0200
@@ -3,17 +3,38 @@
 widget_desc("Jump") {
     longdesc
     ||
-    Jump widget brings focus to a different page. Mandatory single argument
+    Jump widget brings focus to a different page. Mandatory first argument
     gives name of the page.
 
-    Optional single path is used as new reference when jumping to a relative
-    page, it must point to a HMI_NODE.
+    If first path is pointint to HMI_NODE variable is used as new reference 
+    when jumping to a relative page.
 
+    Additional arguments are unordered options:
+
+    - Absolute: force page jump to be not relative even if first path is of type HMI_NODE
+
+    - name=value: Notify jump by setting variable with path having same name assigned
+        
     "active"+"inactive" labeled elements can be provided and reflect current
     page being shown.
 
-    "disabled" labeled element, if provided, is shown instead of "active" or
-    "inactive" widget when pointed HMI_NODE is null.
+    Exemples:
+    
+    Relative jump:
+
+    HMI:Jump:RelativePage@/PUMP9
+    HMI:Jump:RelativePage@/PUMP9@role=.userrole#role=="admin"
+
+    Absolute jump:
+
+    HMI:Jump:AbsolutePage
+    HMI:Jump:AbsolutePage@role=.userrole#role=="admin"
+
+    Forced absolute jump:
+
+    HMI:Jump:AbsolutePage:Absolute@/PUMP9
+    HMI:Jump:AbsolutePage:Absolute:notify=1@notify=/PUMP9
+
     ||
 
     shortdesc > Jump to given page
@@ -27,34 +48,15 @@
 ||
         activable = false;
         active = false;
-        disabled = false;
         frequency = 2;
 
         update_activity() {
-            if(this.active) {
-                 /* show active */ 
-                 this.active_elt.style.display = "";
-                 /* hide inactive */ 
-                 this.inactive_elt.style.display = "none";
-            } else {
-                 /* show inactive */ 
-                 this.inactive_elt.style.display = "";
-                 /* hide active */ 
-                 this.active_elt.style.display = "none";
-            }
+            this.set_activation_state(this.active);
         }
 
         update_disability() {
-            if(this.disabled) {
-                /* show disabled */ 
-                this.disabled_elt.style.display = "";
-                /* hide inactive */ 
-                this.inactive_elt.style.display = "none";
-                /* hide active */ 
-                this.active_elt.style.display = "none";
-            } else {
-                /* hide disabled */ 
-                this.disabled_elt.style.display = "none";
+            this.animate_enable();
+            if(this.enable_state) {
                 this.update_activity();
             }
         }
@@ -66,8 +68,8 @@
                 /* TODO: in order to allow jumps to page selected through for exemple a dropdown,
                    support path pointing to local variable whom value 
                    would be an HMI_TREE index and then jump to a relative page not hard-coded in advance */
-                if(!that.disabled) {
-                    const index = that.indexes.length > 0 ? that.indexes[0] + that.offset : undefined;
+                if(that.enable_state) {
+                    const index = (that.is_relative && that.indexes.length > 0) ? that.indexes[0] + that.offset : undefined;
                     fading_page_switch(name, index);
                 }
             }
@@ -82,43 +84,43 @@
             }
         }
 
-        dispatch(value) {
-            this.disabled = !Number(value);
-
-            // TODO : use RequestAnimate and animate()
-
+        animate() {
             this.update_state();
         }
 ||
 }
 
+def "func:is_relative_jump" {
+    param "widget";
+    result "$widget/path and $widget/path[1]/@type='HMI_NODE' and not($widget/arg[position()>1 and @value = 'Absolute'])";
+}
+
 widget_defs("Jump") {
-    // TODO: ensure both active and inactive are provided
-    const "activity" optional_labels("active inactive");
-    const "have_activity","string-length($activity)>0";
-    value "$activity";
+    optional_activable();
 
-    const "disability" optional_labels("disabled");
-    const "have_disability","$have_activity and string-length($disability)>0";
-    value "$disability";
+    const "jump_disability","$has_activity and $has_disability";
 
     |     init: function() {
     |         this.element.onclick = this.make_on_click();
-    if "$have_activity" {
+    if "$has_activity" {
     |         this.activable = true;
     }
-    if "not($have_disability)" {
-    |         this.unsubscribable = true;
-    }
     >         this.update_state = 
     choose {
-        when "$have_disability" {
+        when "$jump_disability" {
             > this.update_disability
         }
-        when "$have_activity" {
+        when "$has_activity" {
             > this.update_activity
         }
-        otherwise > null
+        otherwise > function(){}
+    }
+    > ;\n
+
+    >         this.is_relative = 
+    choose{
+        when "func:is_relative_jump(.)" > true
+        otherwise > false
     }
     > ;\n
     |     },
@@ -127,9 +129,11 @@
 
 widget_page("Jump"){
     param "page_desc";
-    /* check that given path is compatible with page's reference path */
-    if "path" {
-        /* TODO: suport local variable containing an HMI_TREE index to jump to a relative page */
+    /* jump is considered relative jump if first path points to HMI_NODE
+       but a jump can be forced Absolute by adding a "Absolute" argument */
+    if "func:is_relative_jump(.)" {
+        /* if relative check that given path is compatible with page's reference path */
+
         /* when no page name provided, check for same page */
         const "target_page_name" choose {
             when "arg" value "arg[1]/@value";
@@ -142,9 +146,12 @@
 
         if "not(func:same_class_paths($target_page_path, path[1]/@value))"
             error > Jump id="«@id»" to page "«$target_page_name»" with incompatible path "«path[1]/@value» (must be same class as "«$target_page_path»")
+
     }
 }
 
+
+
 /* TODO: move to detachable pages ysl2 */
 emit "cssdefs:jump"
 ||