Commit 15624210 authored by maxchaza's avatar maxchaza

Merge branch 'hotfix/jsduckForFunction'

parents 7b18c3de d99750d2
......@@ -7,7 +7,7 @@
/**
* The version of the application.
*/
"version": "3.0.14",
"version": "3.0.15",
/**
* The relative path to the application's markup file (html, jsp, asp, etc.).
......
[
{
"name":"MetExplore",
"groups":[
{
"name":"Model",
"classes":[
"ColorComponent",
"ComparedPanel",
"Compartment",
"GeneralStyle",
"LinkData",
"LinkStyle",
"Mapping",
"MappingData",
"MetaboliteStyle",
"NetworkData",
"NetworkVizSession",
"NodeData",
"Pathway",
"ReactionStyle",
"Scale",
"ValueMapping"
]
},{
"name":"metExploreD3",
"classes":[
"metExploreD3.*"
]
},{
"name":"metExploreViz",
"classes":[
"metExploreViz.*"
]
}
]
}
]
\ No newline at end of file
{
"--": "./",
"--warnings": [
"all:ext/src"
],
"--ignore-html": [
"locale",
"debug"
],
"--categories" : "categories.json",
"--output" : "docs",
"--exclude": "app.json,bootstrap.css,bootstrap.json,bootstrap.jsonp,build.xml,karma.conf.js,build/,docs/,ext/,licenses/,sass/,scripts/,src/,test/,resources/css/,resources/ext/,resources/font-awesome/,resources/font-ext/,resources/fonts/,resources/icons/,resources/images/,resources/css/,resources/lib/d3.js/,resources/lib/graphjs/,resources/lib/jquery/,resources/lib/jquery-3.0.0.min.js,resources/lib/dagre.js,app.js"
}
......@@ -2,7 +2,6 @@
* @author MC
* Functions to extend d3js selection function
*/
d3.selection.prototype.attrEditor = function(attr, val) {
var selection = this;
......
......@@ -960,16 +960,16 @@ metExploreD3.GraphStyleEdition = {
arrBypass.push(d3.select(this)[attrType](attrName));
});
valuesBypassed = [...new Set(arrBypass)];
valuesBypassed = Array.from(new Set(arrBypass));
selection.selectAll(target+":not(.bypassed"+attrType+attrName+biologicalType+")")
.each(function(){
arr.push(d3.select(this)[attrType](attrName));
});
values = [...new Set(arr)];
values = Array.from(new Set(arr));
union = [...new Set(valuesBypassed.concat(values))];
union = Array.from(new Set(valuesBypassed.concat(values)));
});
if(valuesBypassed.length>0 &&
......
......@@ -2,11 +2,6 @@
* @author MC
* (a)description : Basic functions
*/
String.prototype.isEmpty = function() {
return (!this.trim());
};
metExploreD3.GraphUtils = {
decodeJSON : function(json){
try {
......@@ -1936,3 +1931,6 @@ clone.setAttribute("version", "1.1");
}
};
String.prototype.isEmpty = function() {
return (!this.trim());
};
\ No newline at end of file
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