Merge branch 'release/0.4.1'

Changelog.md

@@ -1,3 +1,16 @@
+## 0.4.1
+* `select_nodes` behavior now supports multiple selection with rectangular brush and modifier
+  keys. check out
+  [the example](http://dc-js.github.io/dc.graph.js/examples/rectangular-selection.html?layout=dagre).
+* build graphs in the browser with simple `draw_graphs`
+  behavior. [example](http://dc-js.github.io/dc.graph.js/examples/network-building.html).
+* `random_graph` utility abstracted from the example - it's not particularly sophisticated but it's
+  helpful for writing examples.
+* arrow and textPath id's could get cross-linked when there were multiple dc.graphs in a page. (SVG
+  IDs need to be unique across the whole page.)
+* option to enable zoom only when alt-key pressed. (hopefully in the near future zoom will be a
+  mode/behavior and we'll activate modes based on modifier keys.)
+
 ## 0.4.0
 * new `convert_tree` data import function is slightly more general than the old `convert_nest`
 * layout engines are proper objects. all layout parameters are moved to the layout objects and

Gruntfile.js

@@ -163,7 +163,7 @@ module.exports = function (grunt) {
                             'querystring.js',
                             'chart.registry.js',
                             'timeline.js',
-                            'node_modules/crossfilter/crossfilter.js',
+                            'node_modules/crossfilter2/crossfilter.js',
                             'node_modules/d3/d3.js',
                             'node_modules/dc/dc.js',
                             'node_modules/jquery/dist/jquery.js',
@@ -263,7 +263,8 @@ module.exports = function (grunt) {
     grunt.registerTask('build', ['concat', 'uglify']);
     grunt.registerTask('docs', ['build', 'copy', 'jsdoc', 'jsdoc2md']);
     grunt.registerTask('web', ['docs', 'gh-pages']);
-    grunt.registerTask('server', ['docs', 'connect:server', 'watch:scripts']);
+    grunt.registerTask('server', ['build', 'copy', 'connect:server', 'watch:scripts']);
+    grunt.registerTask('server:docs', ['docs', 'connect:server', 'watch:docs']);
     grunt.registerTask('lint', ['build', 'jshint', 'jscs']);
     grunt.registerTask('default', ['build', 'shell:hooks']);
     grunt.registerTask('doc-debug', ['build', 'jsdoc', 'jsdoc2md', 'connect:server', 'watch:docs']);
@@ -277,6 +278,7 @@ module.exports.jsFiles = [
     'src/generate_objects.js',
     'src/shape.js',
     'src/diagram.js',
+    'src/engine.js',
     'src/webworker_layout.js',
     'src/graphviz_attrs.js',
     'src/cola_layout.js',
@@ -288,11 +290,15 @@ module.exports.jsFiles = [
     'src/tree_constraints.js',
     'src/behavior.js',
     'src/tip.js',
+    'src/edit_text.js',
     'src/select_nodes.js',
+    'src/filter_selection.js',
+    'src/label_nodes.js',
     'src/highlight_neighbors.js',
     'src/highlight_paths_group.js',
     'src/highlight_paths.js',
     'src/expand_collapse.js',
+    'src/draw_graphs.js',
     'src/load_graph.js',
     'src/munge_graph.js',
     'src/flat_group.js',

dc.graph.css

@@ -9,6 +9,7 @@
     font: bold 14px verdana, san-serif;
     text-anchor: middle;
     pointer-events: none;
+    user-select: none;
 }
 
 .dc-graph text.edge-label {
@@ -21,6 +22,11 @@
     pointer-events: none;
 }
 
+.dc-graph g.brush rect.extent {
+    fill: #4682b4;
+    fill-opacity: 0.125;
+}
+
 .dc-graph > svg {
     display: block;
 }