Commit 77ea1733 authored by Maxime Chazalviel's avatar Maxime Chazalviel

Merge branch 'master' into develop

parents 57bba12c 582658fe
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/** /**
* The version of the application. * The version of the application.
*/ */
"version": "2.6.4", "version": "2.6.5",
/** /**
* The relative path to the application's markup file (html, jsp, asp, etc.). * The relative path to the application's markup file (html, jsp, asp, etc.).
...@@ -222,8 +222,7 @@ ...@@ -222,8 +222,7 @@
"js": [ "js": [
{ {
"path": "app.js", "path": "app.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "metexploreviz.js" "path": "metexploreviz.js"
...@@ -244,143 +243,115 @@ ...@@ -244,143 +243,115 @@
}, },
{ {
"path": "resources/lib/metExploreViz.js", "path": "resources/lib/metExploreViz.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/NetworkVizSession.js", "path": "resources/lib/model/NetworkVizSession.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/LinkData.js", "path": "resources/lib/model/LinkData.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/NodeData.js", "path": "resources/lib/model/NodeData.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/NetworkData.js", "path": "resources/lib/model/NetworkData.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/GeneralStyle.js", "path": "resources/lib/model/GeneralStyle.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/LinkStyle.js", "path": "resources/lib/model/LinkStyle.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/MetaboliteStyle.js", "path": "resources/lib/model/MetaboliteStyle.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/ReactionStyle.js", "path": "resources/lib/model/ReactionStyle.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/Pathway.js", "path": "resources/lib/model/Pathway.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/Compartment.js", "path": "resources/lib/model/Compartment.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/Mapping.js", "path": "resources/lib/model/Mapping.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/MappingData.js", "path": "resources/lib/model/MappingData.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/Scale.js", "path": "resources/lib/model/Scale.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/ColorMapping.js", "path": "resources/lib/model/ColorMapping.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/model/ComparedPanel.js", "path": "resources/lib/model/ComparedPanel.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/D3Extention.js", "path": "resources/lib/functions/D3Extention.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphLink.js", "path": "resources/lib/functions/GraphLink.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphNode.js", "path": "resources/lib/functions/GraphNode.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphCaption.js", "path": "resources/lib/functions/GraphCaption.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphUtils.js", "path": "resources/lib/functions/GraphUtils.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphNetwork.js", "path": "resources/lib/functions/GraphNetwork.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/Features.js", "path": "resources/lib/functions/Features.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphFunction.js", "path": "resources/lib/functions/GraphFunction.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphMapping.js", "path": "resources/lib/functions/GraphMapping.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphPanel.js", "path": "resources/lib/functions/GraphPanel.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphPath.js", "path": "resources/lib/functions/GraphPath.js",
"bundle": true, "bundle": true
"update": "delta"
}, },
{ {
"path": "resources/lib/functions/GraphStyleEdition.js", "path": "resources/lib/functions/GraphStyleEdition.js",
"bundle": true, "bundle": true
"update": "delta"
} }
], ],
...@@ -620,8 +591,7 @@ ...@@ -620,8 +591,7 @@
*/ */
"cache": { "cache": {
"enable": false, "enable": false
"daelts": true
}, },
......
...@@ -46,7 +46,6 @@ text.reaction{ ...@@ -46,7 +46,6 @@ text.reaction{
max-width: 200px; max-width: 200px;
} }
.brush{ .brush{
fill: #99BCE8;
fill-opacity: 0.1; fill-opacity: 0.1;
stroke: #99BCE8; stroke: #99BCE8;
shape-rendering: crispEdges; shape-rendering: crispEdges;
......
...@@ -1437,9 +1437,24 @@ metExploreD3.GraphNode = { ...@@ -1437,9 +1437,24 @@ metExploreD3.GraphNode = {
return d.getBiologicalType() === 'reaction'; return d.getBiologicalType() === 'reaction';
}) })
.addNodeText(reactionStyle); .addNodeText(reactionStyle);
}
} metExploreD3.GraphNode.updatedNodes
.each(function (d) {
// set corresponding event handler
var name = reactionStyle.getDisplayLabel(d, reactionStyle.getLabel());
metExploreD3.GraphStyleEdition.changeNodeLabel(d, parent, name);
if (metExploreD3.GraphStyleEdition.editMode == true) {
metExploreD3.GraphStyleEdition.startDragLabel(parent);
}
else {
metExploreD3.GraphStyleEdition.endDragLabel(parent);
metExploreD3.GraphNode.applyEventOnNode(parent);
}
});
metExploreD3.GraphNode.updatedNodes metExploreD3.GraphNode.updatedNodes
.filter(function (d) { .filter(function (d) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment