Merge remote-tracking branch 'origin/master' into lib-commands

Author: rreusser

lib/groupby.js

@@ -0,0 +1,11 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = require('../src/transforms/groupby');

lib/index.js

@@ -10,6 +10,7 @@
 
 var Plotly = require('./core');
 
+// traces
 Plotly.register([
     require('./bar'),
     require('./box'),
@@ -30,9 +31,19 @@ Plotly.register([
     require('./scattermapbox')
 ]);
 
-// add transforms
+// transforms
+//
+// Please note that all *transform* methods are executed before
+// all *calcTransform* methods - which could possibly lead to
+// unexpected results when applying multiple transforms of different types
+// to a given trace.
+//
+// For more info, see:
+// https://github.com/plotly/plotly.js/pull/978#pullrequestreview-2403353
+//
 Plotly.register([
-    require('./filter')
+    require('./filter'),
+    require('./groupby')
 ]);
 
 module.exports = Plotly;

src/components/dragelement/index.js

@@ -177,6 +177,8 @@ function coverSlip() {
     return cover;
 }
 
+dragElement.coverSlip = coverSlip;
+
 function finishDrag(gd) {
     gd._dragging = false;
     if(gd._replotPending) Plotly.plot(gd);

src/components/drawing/index.js

@@ -343,6 +343,7 @@ drawing.textPointStyle = function(s, trace) {
     s.each(function(d) {
         var p = d3.select(this),
             text = d.tx || trace.text;
+
         if(!text || Array.isArray(text)) {
             // isArray test handles the case of (intentionally) missing
             // or empty text within a text array

src/components/errorbars/plot.js

@@ -16,8 +16,9 @@ var subTypes = require('../../traces/scatter/subtypes');
 
 module.exports = function plot(traces, plotinfo, transitionOpts) {
     var isNew;
-    var xa = plotinfo.x(),
-        ya = plotinfo.y();
+
+    var xa = plotinfo.xaxis,
+        ya = plotinfo.yaxis;
 
     var hasAnimation = transitionOpts && transitionOpts.duration > 0;
 

src/components/modebar/buttons.js

@@ -420,7 +420,7 @@ function handleGeo(gd, ev) {
         geoIds = Plots.getSubplotIds(fullLayout, 'geo');
 
     for(var i = 0; i < geoIds.length; i++) {
-        var geo = fullLayout[geoIds[i]]._geo;
+        var geo = fullLayout[geoIds[i]]._subplot;
 
         if(attr === 'zoom') {
             var scale = geo.projection.scale();

src/components/rangeslider/constants.js

@@ -0,0 +1,51 @@
+/**
+* Copyright 2012-2016, Plotly, Inc.
+* All rights reserved.
+*
+* This source code is licensed under the MIT license found in the
+* LICENSE file in the root directory of this source tree.
+*/
+
+'use strict';
+
+module.exports = {
+
+    // attribute container name
+    name: 'rangeslider',
+
+    // class names
+
+    containerClassName: 'rangeslider-container',
+    bgClassName: 'rangeslider-bg',
+    rangePlotClassName: 'rangeslider-rangeplot',
+
+    maskMinClassName: 'rangeslider-mask-min',
+    maskMaxClassName: 'rangeslider-mask-max',
+    slideBoxClassName: 'rangeslider-slidebox',
+
+    grabberMinClassName: 'rangeslider-grabber-min',
+    grabAreaMinClassName: 'rangeslider-grabarea-min',
+    handleMinClassName: 'rangeslider-handle-min',
+
+    grabberMaxClassName: 'rangeslider-grabber-max',
+    grabAreaMaxClassName: 'rangeslider-grabarea-max',
+    handleMaxClassName: 'rangeslider-handle-max',
+
+    // style constants
+
+    maskColor: 'rgba(0,0,0,0.4)',
+
+    slideBoxFill: 'transparent',
+    slideBoxCursor: 'ew-resize',
+
+    grabAreaFill: 'transparent',
+    grabAreaCursor: 'col-resize',
+    grabAreaWidth: 10,
+    grabAreaMinOffset: -6,
+    grabAreaMaxOffset: -2,
+
+    handleWidth: 2,
+    handleRadius: 1,
+    handleFill: '#fff',
+    handleStroke: '#666',
+};