Skip to content

Commit

Permalink
v1.15.13 fixed numeric label loading bug
Browse files Browse the repository at this point in the history
  • Loading branch information
@cornhundred
cornhundred committed Mar 29, 2017
1 parent e656807 commit 9c623f4
Show file tree
Hide file tree
Showing 8 changed files with 115 additions and 113 deletions.
3 changes: 1 addition & 2 deletions clustergrammer.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions clustergrammer.min.js
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions clustergrammer.node.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions clustergrammer.node.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clustergrammer",
"version": "v1.15.12",
"version": "v1.15.13",
"description": "This is a clustergram implemented in D3.js. I started from the example http://bost.ocks.org/mike/miserables/ and added the following features",
"main": "clustergrammer.node.js",
"scripts": {
Expand Down
3 changes: 1 addition & 2 deletions src/config/check_nodes_for_categories.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ module.exports = function check_nodes_for_categories(nodes){
var super_string = ': ';
var has_cat = true;

console.log(nodes)
_.each(nodes, function(inst_node){
var inst_name = String(inst_node.name)
var inst_name = String(inst_node.name);
if (inst_name.indexOf(super_string) < 0){
has_cat = false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var awesomplete = require('awesomplete');
require('!style!css!./d3.slider/d3.slider.css');
require('!style!css!awesomplete/awesomplete.css');

/* clustergrammer v1.15.12
/* clustergrammer v1.15.13
* Nick Fernandez, Ma'ayan Lab, Icahn School of Medicine at Mount Sinai
* (c) 2017
*/
Expand Down
186 changes: 93 additions & 93 deletions webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,97 +33,97 @@ module.exports = [
]
}
},
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.min.js',
// libraryTarget: 'var',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// },
// {
// entry: './src/main.js',
// // devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
// devtool: DEBUG ? 'cheap-module-source-map' : false,
// target: 'web',
// output: {
// path: __dirname,
// filename: 'clustergrammer.node.min.js',
// libraryTarget: 'commonjs2',
// library: 'Clustergrammer'
// },
// externals: {
// 'jQuery': 'jQuery',
// 'lodash': '_',
// 'underscore': '_',
// 'd3': 'd3'
// },
// plugins:[
// new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
// ],
// module: {
// loaders: [
// {
// test: /\.js$/,
// loader: 'babel',
// query: {
// presets: ['es2015']
// }
// }
// ]
// }
// }
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.min.js',
libraryTarget: 'var',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
},
{
entry: './src/main.js',
// devtool: DEBUG ? 'cheap-module-eval-source-map' : false,
devtool: DEBUG ? 'cheap-module-source-map' : false,
target: 'web',
output: {
path: __dirname,
filename: 'clustergrammer.node.min.js',
libraryTarget: 'commonjs2',
library: 'Clustergrammer'
},
externals: {
'jQuery': 'jQuery',
'lodash': '_',
'underscore': '_',
'd3': 'd3'
},
plugins:[
new webpack.optimize.UglifyJsPlugin({compress: { warnings: false }})
],
module: {
loaders: [
{
test: /\.js$/,
loader: 'babel',
query: {
presets: ['es2015']
}
}
]
}
}
];

0 comments on commit 9c623f4

Please sign in to comment.