X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=static%2FTopologyComposer%2Fjs%2Fmodel_graph_editor.js;h=700b43265aa0c9f90d7166bbb2aa6095169871b2;hb=048de56ecddc28513e023fa422dc1ed7e2d3ec6f;hp=4afc95588cc5b0e16e21ed83ec1221303a5e587a;hpb=c43f285349b9222b3017eaeec5d0959653a0c814;p=osm%2FLW-UI.git diff --git a/static/TopologyComposer/js/model_graph_editor.js b/static/TopologyComposer/js/model_graph_editor.js index 4afc955..700b432 100644 --- a/static/TopologyComposer/js/model_graph_editor.js +++ b/static/TopologyComposer/js/model_graph_editor.js @@ -195,8 +195,10 @@ TCD3.ModelGraphEditor = (function () { * @returns {boolean} */ ModelGraphEditor.prototype.updateGraphParams = function (args, success, error) { + var self = this; var controller = new TCD3.OsmController(); - controller.updateGraphParams(args, function(){ + controller.updateGraphParams(args, function(result){ + self.updateData(result); success && success(); }, error); }; @@ -218,8 +220,9 @@ TCD3.ModelGraphEditor = (function () { if (self.model.layer[current_layer].nodes[node_type].removable.callback) { var c = self.model.callback[self.model.layer[current_layer].nodes[node_type].removable.callback].class; var controller = new TCD3.OsmController(); - controller[self.model.layer[current_layer].nodes[node_type].removable.callback](self, node, function () { - self.parent.removeNode.call(self, node); + controller[self.model.layer[current_layer].nodes[node_type].removable.callback](self, node, function (result) { + self._deselectAllNodes(); + self.updateData(result); success && success(); }, error); } else { @@ -263,11 +266,10 @@ TCD3.ModelGraphEditor = (function () { link.directed_edge = direct_edge; var c = self.model.callback[callback].class; var controller = new TCD3.OsmController(); - controller[callback](self, link, function () { + controller[callback](self, link, function (result) { self._deselectAllNodes(); - self.parent.addLink.call(self, link); - if (success) - success(); + self.updateData(result); + success && success(); }, error); } else { log('addLink: callback undefined in model spec.'); @@ -294,6 +296,7 @@ TCD3.ModelGraphEditor = (function () { var source_type = s.info.type; var destination_type = d.info.type; var current_layer = self.getCurrentView(); + console.log(self.model.layer[current_layer]) if (self.model.layer[current_layer].allowed_edges && self.model.layer[current_layer].allowed_edges[source_type] && self.model.layer[current_layer].allowed_edges[source_type].destination[destination_type] && self.model.layer[current_layer].allowed_edges[source_type].destination[destination_type].removable ) { @@ -301,10 +304,12 @@ TCD3.ModelGraphEditor = (function () { var callback = self.model.layer[current_layer].allowed_edges[source_type].destination[destination_type].removable.callback; var c = self.model.callback[callback].class; var controller = new TCD3.OsmController(); - controller[callback](self, link, function () { + controller[callback](self, link, function (result) { self._deselectAllNodes(); self._deselectAllLinks(); - self.parent.removeLink.call(self, link.index); + + self.updateData(result); + // success && success(); success && success(); }, error); } else {