diff --git a/grapheditorxblock/public/js/grapheditorxblock.js b/grapheditorxblock/public/js/grapheditorxblock.js index ece0a6a5f9b003d3bfc75e25cca1bb7962276892..75b6920e51aa4823110c55c38add157ca8557b75 100644 --- a/grapheditorxblock/public/js/grapheditorxblock.js +++ b/grapheditorxblock/public/js/grapheditorxblock.js @@ -123009,13 +123009,12 @@ var interactions = { // Get the node and all nodes of the children of cell: var triggerNodes = interactions.cellNodes(graph, cell, true); - var handlers = []; var actionString = cell.value.getAttribute('onclick'); - handlers.concat(interactions.createEventHandlers(graph, actionString)); + var handlers = interactions.createEventHandlers(graph, actionString); // Legacy graphs had actions in the onhover attribute as well: actionString = cell.value.getAttribute('onhover'); - handlers.concat(interactions.createEventHandlers(graph, actionString)); + handlers = handlers.concat(interactions.createEventHandlers(graph, actionString)); handlers.forEach(function(handler) { interactions.installHandler(handler, graph, triggerNodes); @@ -123394,7 +123393,7 @@ InteractionsUi = function(panel) { continue; } for (var j = 0; j < rules.length; j++) { - this.rules.push(new Rule(this, rule)); + this.rules.push(new Rule(this, rules[j])); } } } diff --git a/grapheditorxblock/src/js/interactions-ui.js b/grapheditorxblock/src/js/interactions-ui.js index 6772692099825f00804d3e8bf620b86e09b67f52..d04b7ec1239b9848b34fac93d621b6ad073decbd 100644 --- a/grapheditorxblock/src/js/interactions-ui.js +++ b/grapheditorxblock/src/js/interactions-ui.js @@ -91,7 +91,7 @@ InteractionsUi = function(panel) { continue; } for (var j = 0; j < rules.length; j++) { - this.rules.push(new Rule(this, rule)); + this.rules.push(new Rule(this, rules[j])); } } } diff --git a/grapheditorxblock/src/js/interactions.js b/grapheditorxblock/src/js/interactions.js index 4ba8955292effa27fd552c4bfee8d5f30e7d5ca6..d2f7c98f665ff937dd37dce0d4037b389894e679 100644 --- a/grapheditorxblock/src/js/interactions.js +++ b/grapheditorxblock/src/js/interactions.js @@ -37,13 +37,12 @@ var interactions = { // Get the node and all nodes of the children of cell: var triggerNodes = interactions.cellNodes(graph, cell, true); - var handlers = []; var actionString = cell.value.getAttribute('onclick'); - handlers.concat(interactions.createEventHandlers(graph, actionString)); + var handlers = interactions.createEventHandlers(graph, actionString); // Legacy graphs had actions in the onhover attribute as well: actionString = cell.value.getAttribute('onhover'); - handlers.concat(interactions.createEventHandlers(graph, actionString)); + handlers = handlers.concat(interactions.createEventHandlers(graph, actionString)); handlers.forEach(function(handler) { interactions.installHandler(handler, graph, triggerNodes);