cpee 2.1.22 → 2.1.26

data/cockpit/themes/control/theme.js

@@ -8,6 +8,7 @@ function WFAdaptorManifestation(adaptor) {
   this.compact = false;
   this.striped = true;
   this.endpoints = {};
+  this.presstimer;
 
   //{{{ transform the details data to description parts based on rng
   this.source = function(base,opts) {
@@ -137,93 +138,104 @@ function WFAdaptorManifestation(adaptor) {
     }
   } //}}}
 
-  // Events
-  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
-    if(e.button == 0) {  // left-click
-    } else if(e.button == 1) { // middle-click
-    } else if(e.button == 2) { // right-click
-      if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
+  function contextMenuHandling(svgid,e,child,sibling) { //{{{
+    if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
 
-      var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
-      var group = null;
-      var menu = {};
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var group = null;
+    var menu = {};
 
-      if (child) {
-        group = self.elements[xml_node.get(0).tagName].permissible_children(xml_node,'into');
+    if (child) {
+      group = self.elements[xml_node.get(0).tagName].permissible_children(xml_node,'into');
+      if(group.length > 0) {
+        menu['Insert into'] = group;
+        copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
+      }
+      if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
+        group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
         if(group.length > 0) {
-          menu['Insert into'] = group;
-          copyOrMove(menu['Insert into'],group,xml_node,self.adaptor.description.insert_first_into);
-        }
-        if (self.elements[xml_node.get(0).tagName].permissible_children_expert) {
-          group = self.elements[xml_node.get(0).tagName].permissible_children_expert(xml_node,'into');
-          if(group.length > 0) {
-            menu['Insert into (Experts Only!)'] = group;
-            copyOrMove(menu['Insert into (Experts Only!)'],group,xml_node,self.adaptor.description.insert_first_into);
-          }
+          menu['Insert into (Experts Only!)'] = group;
+          copyOrMove(menu['Insert into (Experts Only!)'],group,xml_node,self.adaptor.description.insert_first_into);
         }
       }
-      if (sibling) {
-        group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
+    }
+    if (sibling) {
+      group = self.elements[xml_node.parent().get(0).tagName].permissible_children(xml_node,'after');
+      if(group.length > 0) {
+        menu['Insert after'] = group;
+        copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
+      }
+      if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
+        group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
         if(group.length > 0) {
-          menu['Insert after'] = group;
-          copyOrMove(menu['Insert after'],group,xml_node,self.adaptor.description.insert_after);
-        }
-        if (self.elements[xml_node.parent().get(0).tagName].permissible_children_expert) {
-          group = self.elements[xml_node.parent().get(0).tagName].permissible_children_expert(xml_node,'after');
-          if(group.length > 0) {
-            menu['Insert after (Experts Only!)'] = group;
-            copyOrMove(menu['Insert after (Experts Only!)'],group,xml_node,self.adaptor.description.insert_after);
-          }
+          menu['Insert after (Experts Only!)'] = group;
+          copyOrMove(menu['Insert after (Experts Only!)'],group,xml_node,self.adaptor.description.insert_after);
         }
       }
+    }
 
-      if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
-        var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-        icon.children('.rfill').addClass('menu');
-        menu['Delete'] = [{
-          'label': 'Remove Element',
-          'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
-          'menu_icon': icon,
-          'type': undefined,
-          'params': [null, xml_node, self.selected()]
-        }];
-      }
-      if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
-        var icon =  self.elements.callmanipulate.illustrator.svg.clone();
-        icon.children('.rfill:last').addClass('menu');
-        menu['Delete'].push({
-          'label': 'Remove Scripts',
-          'function_call': self.adaptor.description.remove,
-          'menu_icon': icon,
-          'type': undefined,
-          'params': ['> code', xml_node]
-        });
-      }
-      if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
-        var icon =  self.elements.call.illustrator.svg.clone();
-        icon.children('g.replace').addClass('active');
-        var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
-        if (vtarget.length > 0) {
-          if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
-            menu['Position'] = [{
-              'label': 'No Execution from here',
-              'function_call': del_ui_pos,
-              'menu_icon': icon,
-              'type': undefined,
-              'params': xml_node
-            }];
-          } else {
-            menu['Position'] = [{
-              'label': 'Execute from here',
-              'function_call': add_ui_pos,
-              'menu_icon': icon,
-              'type': undefined,
-              'params': xml_node
-            }];
-          }
+    if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
+      var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
+      icon.children('.rfill').addClass('menu');
+      menu['Delete'] = [{
+        'label': 'Remove Element',
+        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'menu_icon': icon,
+        'type': undefined,
+        'params': [null, xml_node, self.selected()]
+      }];
+    }
+    if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
+      var icon =  self.elements.callmanipulate.illustrator.svg.clone();
+      icon.children('.rfill:last').addClass('menu');
+      menu['Delete'].push({
+        'label': 'Remove Scripts',
+        'function_call': self.adaptor.description.remove,
+        'menu_icon': icon,
+        'type': undefined,
+        'params': ['> code', xml_node]
+      });
+    }
+    if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
+      var icon =  self.elements.call.illustrator.svg.clone();
+      icon.children('g.replace').addClass('active');
+      var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+      if (vtarget.length > 0) {
+        if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+          menu['Position'] = [{
+            'label': 'No Execution from here',
+            'function_call': del_ui_pos,
+            'menu_icon': icon,
+            'type': undefined,
+            'params': xml_node
+          }];
+        } else {
+          menu['Position'] = [{
+            'label': 'Execute from here',
+            'function_call': add_ui_pos,
+            'menu_icon': icon,
+            'type': undefined,
+            'params': xml_node
+          }];
         }
       }
-      new CustomMenu(e).contextmenu(menu);
+    }
+    new CustomMenu(e).contextmenu(menu);
+  } //}}}
+
+  // Events
+  this.events.touchend = function(svgid, e) { // {{{
+    clearTimeout(self.presstimer);
+  } // }}}
+  this.events.touchstart = function(svgid, e, child, sibling) { // {{{
+    self.presstimer = window.setTimeout(function() { contextMenuHandling(svgid,e,child,sibling); },1000);
+    return false;
+  } // }}}
+  this.events.mousedown = function(svgid, e, child, sibling) { // {{{
+    if(e.button == 0) {  // left-click
+    } else if(e.button == 1) { // middle-click
+    } else if(e.button == 2) { // right-click
+      contextMenuHandling(svgid,e,child,sibling);
     }
     return false;
   } // }}}
@@ -339,6 +351,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dragstart': self.events.dragstart,
       'mouseover': self.events.mouseover,
@@ -365,6 +379,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -382,6 +398,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -402,6 +420,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
@@ -420,6 +440,8 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) { self.events.mousedown(node,e,false,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,false,false); },
+      'touchend': self.events.touchend,
       'mouseover': self.events.mouseover,
       'mouseout': self.events.mouseout
     }//}}}
@@ -431,9 +453,7 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/end.svg'
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.suppress();
-      }
+      'mousedown': function (node,e) { self.events.suppress(); }
     }//}}}
   }; /*}}}*/
   this.elements.event_end = { /*{{{*/
@@ -443,9 +463,7 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/event_end.svg'
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.suppress();
-      },
+      'mousedown': function (node,e) { self.events.suppress(); },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -466,9 +484,9 @@ function WFAdaptorManifestation(adaptor) {
       },
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -491,9 +509,9 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -506,7 +524,9 @@ function WFAdaptorManifestation(adaptor) {
       'endnodes': 'this',
       'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
       'resolve_symbol': function(node) {
-        if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
+        if($(node).children(':not(parallel_branch)').length > 0) {
+          return 'parallel_complex';
+        } else if($(node).attr('cancel') == 'last' && $(node).attr('wait') == '-1') {
           return 'parallel_simple';
         } else if($(node).attr('cancel') == 'first' && $(node).attr('wait') == '-1') {
           return 'parallel_event_all';
@@ -518,9 +538,9 @@ function WFAdaptorManifestation(adaptor) {
       },
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -583,9 +603,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -676,9 +696,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,false); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -777,9 +797,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -878,9 +898,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -934,9 +954,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1016,9 +1036,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1103,9 +1123,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1175,9 +1195,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1273,9 +1293,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1372,9 +1392,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1459,9 +1479,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1491,9 +1511,9 @@ function WFAdaptorManifestation(adaptor) {
       ];
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,true);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,true); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,true); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,
@@ -1575,9 +1595,9 @@ function WFAdaptorManifestation(adaptor) {
       return childs;
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
-      },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,true,false); },
+      'touchstart': function (node,e) { self.events.touchstart(node,e,true,false); },
+      'touchend': self.events.touchend,
       'click': self.events.click,
       'dblclick': self.events.dblclick,
       'mouseover': self.events.mouseover,

data/cockpit/themes/default/rngs/call.rng

@@ -155,7 +155,7 @@
       </element>
     </element>
   </element>
-  <element name="input" rngui:header="Documentation">
+  <element name="documentation" rngui:header="Documentation">
     <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
       <zeroOrMore rngui:label="Create Argument">
         <element name="item" rngui:label="Description">

data/cockpit/themes/default/rngs/callmanipulate.rng

@@ -195,7 +195,7 @@
     </element>
   </element>
 
-  <element name="input" rngui:header="Documentation">
+  <element name="documentation" rngui:header="Documentation">
     <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
       <zeroOrMore rngui:label="Create Argument">
         <element name="item" rngui:label="Description">