Skip to content
Snippets Groups Projects
Commit c231e986 authored by Mathis Neumann's avatar Mathis Neumann
Browse files

disable broken cose-bilkent, small refactorings

parent 8989f6c2
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ export default Ember.Component.extend({ ...@@ -10,7 +10,7 @@ export default Ember.Component.extend({
themes: Object.keys(Themes), themes: Object.keys(Themes),
layoutAlgorithms: [ layoutAlgorithms: [
'cose', 'cose',
'cose-bilkent', // broken //'cose-bilkent', // broken - see https://github.com/cytoscape/cytoscape.js-cose-bilkent/issues/18
'cola', 'cola',
'grid', 'grid',
'concentric', 'concentric',
......
...@@ -25,7 +25,7 @@ export default Ember.Component.extend({ ...@@ -25,7 +25,7 @@ export default Ember.Component.extend({
}.observes('layout'), }.observes('layout'),
renderGraph: function() { renderGraph: function() {
this.debug('graph',this.get('theme'), this.get('graph')); this.debug('graph',this.get('theme'), this.get('graph'));
this.cytoscape = cytoscape({ this.rendering = cytoscape({
container: this.element, container: this.element,
boxSelectionEnabled: false, boxSelectionEnabled: false,
...@@ -33,7 +33,7 @@ export default Ember.Component.extend({ ...@@ -33,7 +33,7 @@ export default Ember.Component.extend({
style: cytoscapeStyle(this.get('theme')), style: cytoscapeStyle(this.get('theme')),
elements: _.cloneDeep(this.get('graph')), // TODO! elements: _.cloneDeep(this.get('graph')),
layout: { layout: {
name: this.get('layoutAlgorithm'), name: this.get('layoutAlgorithm'),
...@@ -44,7 +44,8 @@ export default Ember.Component.extend({ ...@@ -44,7 +44,8 @@ export default Ember.Component.extend({
} }
}); });
// just for development purposes - TODO: remove
window.cy = cytoscape; window.cy = cytoscape;
window.cytoscape = this.cytoscape; window.cytoscape = this.rendering;
}.on('didInsertElement').observes('layoutAlgorithm', 'graph', 'theme') }.on('didInsertElement').observes('layoutAlgorithm', 'graph', 'theme')
}); });
...@@ -7,7 +7,7 @@ export default Ember.Service.extend({ ...@@ -7,7 +7,7 @@ export default Ember.Service.extend({
createGraph(models) { createGraph(models) {
this.debug('loaded models', models); this.debug('loaded models', models);
const serviceInstances = models.serviceInstances; const serviceInstances = models.serviceInstances;
const services = models.services; // const services = models.services; // not used in current view
const communicationInstances = models.communicationInstances; const communicationInstances = models.communicationInstances;
const nodeGroups = models.nodeGroups; const nodeGroups = models.nodeGroups;
const nodes = models.nodes; const nodes = models.nodes;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment