Merge branch 'release/0.4.0'

Changelog.md

@@ -1,3 +1,13 @@
+## 0.4.0
+* layout engines are proper objects. all layout parameters are moved to the layout objects and
+  deprecated on the diagram object
+* `cola`, `dagre`, `tree` `_layout` are the current layout engines, and it should be possible to
+  plug in others without modifying dc.graph.js
+* using a webworker is optional for layout engines - wrap an engine in `webworker_layout` to use it
+  with a webworker. the only restriction is that all layout parameters must be serializable - so for
+  example the tree layout is not currently webworkable because it takes a bunch of functions.
+* [HTML documentation](http://dc-js.github.io/dc.graph.js/docs/html/)
+
 ## 0.3.16
 * line breaking `dc.line_breaks` function, for `nodeLabel` (which has supported returning an array
   of lines for some time).

Gruntfile.js

@@ -14,12 +14,18 @@ module.exports = function (grunt) {
         banner: grunt.file.read('./LICENSE_BANNER'),
         jsFiles: module.exports.jsFiles,
         colaWorkerFiles: [
+            'src/core.js',
             'src/generate_objects.js',
-            'src/cola.worker.js'
+            'src/graphviz_attrs.js',
+            'src/cola_layout.js',
+            'src/webworker_message.js'
         ],
         dagreWorkerFiles: [
+            'src/core.js',
             'src/generate_objects.js',
-            'src/dagre.worker.js'
+            'src/graphviz_attrs.js',
+            'src/dagre_layout.js',
+            'src/webworker_message.js'
         ]
     };
 
@@ -260,19 +266,26 @@ module.exports = function (grunt) {
     grunt.registerTask('server', ['docs', 'connect:server', 'watch:scripts']);
     grunt.registerTask('lint', ['build', 'jshint', 'jscs']);
     grunt.registerTask('default', ['build', 'shell:hooks']);
+    grunt.registerTask('doc-debug', ['build', 'jsdoc', 'jsdoc2md', 'connect:server', 'watch:docs']);
 };
 
 module.exports.jsFiles = [
     'src/banner.js',   // NOTE: keep this first
     'src/core.js',
+    'src/utils.js',
     'src/depth_first_traversal.js',
     'src/generate_objects.js',
     'src/shape.js',
     'src/diagram.js',
+    'src/webworker_layout.js',
+    'src/graphviz_attrs.js',
+    'src/cola_layout.js',
+    'src/dagre_layout.js',
+    'src/tree_layout.js',
     'src/legend.js',
     'src/constraint_pattern.js',
-    'src/tree_constraints.js',
     'src/tree_positions.js',
+    'src/tree_constraints.js',
     'src/behavior.js',
     'src/tip.js',
     'src/select_nodes.js',