gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix various js errors

Browse Source 
probably due to new cytoscape version
This commit is contained in:
Uwe Steinmann 2020-02-28 18:12:53 +01:00
parent c8df1533e6
commit 23a456e730
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
views/bootstrap/class.WorkflowGraph.php
View File

@ -185,8 +185,8 @@ cy.on('free', 'node', function(evt) {
}); });
cy.on('tap', 'node', function(evt) { cy.on('tap', 'node', function(evt) {
var node = evt.cyTarget; var node = evt.target;
var scratch = node.scratch('app'); var scratch = node.scratch('_app');
if(typeof scratch !== 'undefined') { if(typeof scratch !== 'undefined') {
noty({ noty({
text: (scratch.users ? '<p><?= '<i class="icon-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="icon-group"></i> ' ?> ' + scratch.groups + '</p>' : ''), text: (scratch.users ? '<p><?= '<i class="icon-user"></i> ' ?> ' + scratch.users + '</p>' : '') + (scratch.groups ? '<?= '<i class="icon-group"></i> ' ?> ' + scratch.groups + '</p>' : ''),
@ -272,7 +272,7 @@ $(document).ready(function() {
position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")." position: {x: ".$positions[$nodeid]->x.", y: ".$positions[$nodeid]->y."}," : "")."
classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ", classes: 'action".($iscurtransition ? " current" : ($this->curtransitions ? " light" : ""))."'".(!$this->curtransitions || $iscurtransition && $this->curtransitions ? ",
scratch: { scratch: {
app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"} _app: {groups: \"".str_replace('"', "\\\"", implode(", ", $gnames))."\", users: \"".str_replace('"', "\\\"", implode(", ", $unames))."\"}
}" : "")." }" : "")."
});\n"; });\n";
} }
@ -321,6 +321,7 @@ $(document).ready(function() {
echo "cy.add({ echo "cy.add({
data: { data: {
id: 'E1-".$transition->getID()."', id: 'E1-".$transition->getID()."',
name: '',
source: 'S".$state->getID()."', source: 'S".$state->getID()."',
target: 'A".$transition->getID()."-".$action->getID()."' target: 'A".$transition->getID()."-".$action->getID()."'
}, },
@ -329,6 +330,7 @@ $(document).ready(function() {
echo "cy.add({ echo "cy.add({
data: { data: {
id: 'E2-".$transition->getID()."', id: 'E2-".$transition->getID()."',
name: '',
source: 'A".$transition->getID()."-".$action->getID()."', source: 'A".$transition->getID()."-".$action->getID()."',
target: 'S".$nextstate->getID()."' target: 'S".$nextstate->getID()."'
}, },