Add stacking to bars and lines

FUNCTIONS.md

@@ -81,6 +81,7 @@ Show the seriesList as bars
 Argument | Accepts | Description
 --- | --- | ---
 width | *number* | Width of bars in pixels  
+stack | *boolean* | Should bars be stacked, true by default  
 
 #### .color()
 Change the color of the series
@@ -160,6 +161,7 @@ Argument | Accepts | Description
 --- | --- | ---
 width | *number* | Line thickness  
 fill | *number* | Number between 0 and 10. Use for making area charts  
+stack | *boolean* | Stack lines, often misleading. At least use some fill if you use this  
 show | *number* | Show or hide lines  
 steps | *number* | Show line as step, eg, do not interpolate between points  
 

handlers/lib/index_arguments.js

@@ -9,6 +9,11 @@ module.exports = function indexArguments(functionDef, unorderedArgs) {
   // Validation, does not change the arguments
   _.each(unorderedArgs, function (arg, i) {
     var type = argType(arg);
+
+    if (!functionDef.args[i]) {
+      throw new Error ('Unknown argument #' + i + ' supplied to ' + functionDef.name);
+    }
+
     var required = functionDef.args[i].types;
     var multi = functionDef.args[i].multi;
     var name = functionDef.args[i].name;

index.js

@@ -60,6 +60,10 @@ module.exports = function (kibana) {
         flotSelection$: {
           path: path.resolve(__dirname, 'bower_components/flot/jquery.flot.selection'),
           imports: 'flot'
+        },
+        flotStack$: {
+          path: path.resolve(__dirname, 'bower_components/flot/jquery.flot.stack'),
+          imports: 'flot'
         }
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timelion",
-  "version": "5.0.0-0.1.269",
+  "version": "5.0.0-0.1.270",
   "dependencies": {
     "body-parser": "^1.12.0",
     "boom": "^2.8.0",

public/directives/chart/chart.js

@@ -8,6 +8,7 @@ require('flotCrosshair');
 require('flotCanvas');
 require('flotSelection');
 require('flotSymbol');
+require('flotStack');
 
 var app = require('ui/modules').get('apps/timelion', []);
 var template = '<div class="chart-title"></div><div class="chart-canvas"></div>';

series_functions/bars.js

@@ -10,14 +10,20 @@ module.exports = new Chainable('bars', {
       name: 'width',
       types: ['number', 'null'],
       help: 'Width of bars in pixels'
+    },
+    {
+      name: 'stack',
+      types: ['boolean', 'null'],
+      help: 'Should bars be stacked, true by default'
     }
   ],
   help: 'Show the seriesList as bars',
   fn: function barsFn(args) {
-    return alter(args, function (eachSeries, width) {
+    return alter(args, function (eachSeries, width, stack) {
       eachSeries.bars = eachSeries.bars || {};
       eachSeries.bars.show = width == null ? 1 : width;
       eachSeries.bars.lineWidth = width == null ? 6 : width;
+      eachSeries.stack = stack == null ? true : stack;
       return eachSeries;
     });
   }

series_functions/lines.js

@@ -17,6 +17,11 @@ module.exports = new Chainable('lines', {
       types: ['number', 'null'],
       help: 'Number between 0 and 10. Use for making area charts'
     },
+    {
+      name: 'stack',
+      types: ['boolean', 'null'],
+      help: 'Stack lines, often misleading. At least use some fill if you use this'
+    },
     {
       name: 'show',
       types: ['number', 'null'],
@@ -30,14 +35,15 @@ module.exports = new Chainable('lines', {
   ],
   help: 'Show the seriesList as lines',
   fn: function linesFn(args) {
-    return alter(args, function (eachSeries, width, fill, show, steps) {
+    return alter(args, function (eachSeries, width, fill, stack, show, steps) {
       eachSeries.lines = eachSeries.lines || {};
 
       // Defaults
       if (eachSeries.lines.lineWidth == null) eachSeries.lines.lineWidth = 3;
 
       if (width != null) eachSeries.lines.lineWidth = width;
       if (fill != null)  eachSeries.lines.fill = fill / 10;
+      if (stack != null) eachSeries.stack = stack;
       if (show != null)  eachSeries.lines.show = show;
       if (steps != null) eachSeries.lines.steps = steps;