Skip to content

Commit 9a4bc29

Browse files
jacomyaljacomyal
committed
Merge branch 'master' into forceatlas2-transferable
2 parents 0387a78 + 7bd4b61 commit 9a4bc29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2978
-2355
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/*
22
build/*
3+
*.tgz

‎.npmignore

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
build/*
2+
!build/sigma.require.js
3+
!build/sigma.min.js
4+
!build/plugins/*
5+
test/*
6+
node_modules/*
7+
examples/*
8+
Gruntfile.js
9+
CHANGELOG.md
10+
.travis.yml
11+
.gitignore
12+
*.tgz
13+
*.log

‎CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
## sigma.js - changelog:
22

3+
#### 1.0.2 - release (April 2, 2014)
4+
5+
- Added Canvas curved edge renderer
6+
- Fully refactored examples
7+
- Fixed [#211](https://github.com/jacomyal/sigma.js/issues/211): Added default camera getter
8+
- Fixes on ForceAtlas2 API (thanks to [@adkatrit](https://github.com/adkatrit))
9+
- Added Canvas curved arrows edge renderer (thanks to [@ssidorchick](https://github.com/ssidorchick))
10+
- Fixed [#220](https://github.com/jacomyal/sigma.js/issues/220): WebGL edges batch rendering fixed
11+
- Fixed [#175](https://github.com/jacomyal/sigma.js/issues/175): Disable setAutoSettings in ForceAtlas2
12+
- Fixed some minor typos (thanks to [@anirvan](https://github.com/anirvan))
13+
- Added the `sigma.plugins.dragNodes` plugin for the Canvas renderer (thanks to [@josemazo](https://github.com/josemazo))
14+
- Fixed `gjslint.py does not exist` error (thanks to [@jeroencoumans](https://github.com/jeroencoumans))
15+
- Made it easier to build for newbies by not requiring global `grunt-cli` (thanks to [@eins78](https://github.com/eins78))
16+
- Some minor changes on docs and GEXF parser (thanks to [@Yomguithereal](https://github.com/Yomguithereal))
17+
- Added current version number as `sigma.version`
18+
- Fixed [#236](https://github.com/jacomyal/sigma.js/issues/236): Implemented `kill` renderers method
19+
20+
#### 1.0.1 - release (February 26, 2014)
21+
22+
- Custom node shapes and images plug-in (thanks to [@rpeleg1970](https://github.com/rpeleg1970))
23+
- Fixed [#189](https://github.com/jacomyal/sigma.js/issues/189): Added doubleClick events
24+
- Fixed [#183](https://github.com/jacomyal/sigma.js/issues/183): Avoid using `for in` to iterate over arrays (thanks to [@cdevienne](https://github.com/cdevienne))
25+
- Added `http-server` dependency (thanks to [@oncletom](https://github.com/oncletom))
26+
- Minor fix in LICENSE.txt (thanks to [@gdi2290](https://github.com/gdi2290))
27+
- Added `"hidden"` nodes and edges support
28+
- Fixed typo in `sigma.instances` method (thanks to [@juanpastas](https://github.com/juanpastas))
29+
- Fixed ForceAtlas2 stopForceAtlas2 method
30+
- Improved captors
31+
- Plus some minor and various fixes...
32+
333
#### 1.0.0 - release (January 30, 2014)
434

535
- Finalization:

‎Gruntfile.js

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ module.exports = function(grunt) {
3535
'src/renderers/canvas/sigma.canvas.hovers.def.js',
3636
'src/renderers/canvas/sigma.canvas.nodes.def.js',
3737
'src/renderers/canvas/sigma.canvas.edges.def.js',
38+
'src/renderers/canvas/sigma.canvas.edges.curve.js',
3839
'src/renderers/canvas/sigma.canvas.edges.arrow.js',
40+
'src/renderers/canvas/sigma.canvas.edges.curvedArrow.js',
3941

4042
// Middlewares:
4143
'src/middlewares/sigma.middlewares.rescale.js',
@@ -47,21 +49,27 @@ module.exports = function(grunt) {
4749
'src/misc/sigma.misc.drawHovers.js'
4850
];
4951

52+
var npmJsFiles = coreJsFiles.slice(0);
53+
npmJsFiles.splice(2, 0, 'src/sigma.export.js');
54+
5055
var pluginFiles = [
5156
'plugins/sigma.layout.forceAtlas2/*.js',
5257
'plugins/sigma.parsers.gexf/*.js',
5358
'plugins/sigma.parsers.json/*.js',
5459
'plugins/sigma.plugins.animate/*.js',
55-
'plugins/sigma.plugins.neighborhoods/*.js'
60+
'plugins/sigma.plugins.dragNodes/*.js',
61+
'plugins/sigma.plugins.neighborhoods/*.js',
62+
'plugins/sigma.renderers.customShapes/*.js'
5663
];
5764

5865
// Project configuration:
5966
grunt.initConfig({
6067
pkg: grunt.file.readJSON('package.json'),
6168
closureLint: {
62-
app:{
69+
app: {
6370
closureLinterPath: '/usr/local/bin',
64-
src: coreJsFiles.concat(pluginFiles),
71+
command: 'gjslint',
72+
src: coreJsFiles,
6573
options: {
6674
stdout: true,
6775
strict: true,
@@ -70,7 +78,7 @@ module.exports = function(grunt) {
7078
}
7179
},
7280
jshint: {
73-
all: coreJsFiles.concat(pluginFiles),
81+
all: coreJsFiles,
7482
options: {
7583
'-W055': true,
7684
'-W040': true,
@@ -105,11 +113,15 @@ module.exports = function(grunt) {
105113
},
106114
concat: {
107115
options: {
108-
separator: ';'
116+
separator: '\n'
109117
},
110118
dist: {
111119
src: coreJsFiles,
112120
dest: 'build/sigma.js'
121+
},
122+
require: {
123+
src: npmJsFiles,
124+
dest: 'build/sigma.require.js'
113125
}
114126
},
115127
sed: {
@@ -119,7 +131,7 @@ module.exports = function(grunt) {
119131
pattern: /<!-- START SIGMA IMPORTS -->[\s\S]*<!-- END SIGMA IMPORTS -->/g,
120132
replacement: ['<!-- START SIGMA IMPORTS -->'].concat(coreJsFiles.map(function(path) {
121133
return '<script src="../' + path + '"></script>';
122-
}).concat('<!-- END SIGMA IMPORTS -->')).join('\n ')
134+
}).concat('<!-- END SIGMA IMPORTS -->')).join('\n')
123135
}
124136
},
125137
zip: {
@@ -142,6 +154,7 @@ module.exports = function(grunt) {
142154
// By default, will check lint, hint, test and minify:
143155
grunt.registerTask('default', ['closureLint', 'jshint', 'qunit', 'sed', 'uglify']);
144156
grunt.registerTask('release', ['closureLint', 'jshint', 'qunit', 'sed', 'uglify', 'zip']);
157+
grunt.registerTask('npmPrePublish', ['uglify:plugins', 'concat:require']);
145158

146159
// For travis-ci.org, only launch tests:
147160
grunt.registerTask('travis', ['qunit']);

‎LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2013, Alexis Jacomy, http://sigmajs.org
1+
Copyright (C) 2013-2014, Alexis Jacomy, http://sigmajs.org
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
44
to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![Build Status](https://travis-ci.org/jacomyal/sigma.js.png)](https://travis-ci.org/jacomyal/sigma.js)
22

3-
sigma.js - v1.0.0
3+
sigma.js - v1.0.2
44
=================
55

66
Sigma is a JavaScript library dedicated to graph drawing.
@@ -21,10 +21,10 @@ git clone git@github.com:jacomyal/sigma.js.git
2121

2222
To build the code:
2323

24-
- Install [Node.js](http://nodejs.org/), [NPM](https://npmjs.org/) and [Grunt](http://gruntjs.com/installing-grunt).
24+
- Install [Node.js](http://nodejs.org/).
2525
- Install [gjslint](https://developers.google.com/closure/utilities/docs/linter_howto?hl=en).
2626
- Use `npm install` to install sigma development dependencies.
27-
- Use `grunt uglify` to minify the code with [Uglify](https://github.com/mishoo/UglifyJS). The minified file `sigma.min.js` will then be accessible in the `build/` folder.
27+
- Use `npm run build` to minify the code with [Uglify](https://github.com/mishoo/UglifyJS). The minified file `sigma.min.js` will then be accessible in the `build/` folder.
2828

2929
Also, you can customize the build by adding or removing files from the `coreJsFiles` array in `Gruntfile.js` before applying the grunt task.
3030

0 commit comments

Comments
 (0)