Merge branch 'master' into click-event-madness

Author: etpinard

image_server/test/mocks/line_grid_color.json

@@ -0,0 +1,44 @@
+{
+    "data": [
+        {
+            "y": [
+                -5,
+                -1,
+                1
+            ],
+            "x": [
+                -1,
+                0,
+                1
+            ],
+            "uid": "e95128"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "linecolor": "rgb(10, 10, 10)",
+            "gridcolor": "rgb(200, 200, 200)",
+            "zerolinecolor": "rgb(10, 10, 10)",
+            "type": "linear",
+            "range": [
+                -1.122244488977956,
+                1.122244488977956
+            ],
+            "autorange": true
+        },
+        "yaxis": {
+            "linecolor": "rgb(10, 10, 10)",
+            "gridcolor": "rgb(200, 200, 200)",
+            "zerolinecolor": "rgb(10, 10, 10)",
+            "type": "linear",
+            "range": [
+                -5.439490445859873,
+                1.4394904458598727
+            ],
+            "autorange": true
+        },
+        "height": 450,
+        "width": 1000,
+        "autosize": true
+    }
+}

image_server/test/mocks/line_grid_width.json

@@ -0,0 +1,44 @@
+{
+    "data": [
+        {
+            "y": [
+                -5,
+                -1,
+                1
+            ],
+            "x": [
+                -1,
+                0,
+                1
+            ],
+            "uid": "e9539e"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "linewidth": 2,
+            "gridwidth": 2,
+            "zerolinewidth": 4,
+            "type": "linear",
+            "range": [
+                -1.122244488977956,
+                1.122244488977956
+            ],
+            "autorange": true
+        },
+        "yaxis": {
+            "linewidth": 2,
+            "gridwidth": 2,
+            "zerolinewidth": 4,
+            "type": "linear",
+            "range": [
+                -5.439490445859873,
+                1.4394904458598727
+            ],
+            "autorange": true
+        },
+        "height": 450,
+        "width": 1000,
+        "autosize": true
+    }
+}

image_server/test/mocks/tick_attributes.json

@@ -0,0 +1,44 @@
+{
+    "data": [
+        {
+            "y": [
+                -1,
+                0,
+                -2
+            ],
+            "x": [
+                1,
+                2,
+                3
+            ],
+            "uid": "02de62"
+        }
+    ],
+    "layout": {
+        "xaxis": {
+            "tickwidth": 2,
+            "tickcolor": "blue",
+            "ticklen": 4,
+            "type": "linear",
+            "range": [
+                0.8777555110220441,
+                3.122244488977956
+            ],
+            "autorange": true
+        },
+        "yaxis": {
+            "tickwidth": 2,
+            "tickcolor": "blue",
+            "ticklen": 4,
+            "type": "linear",
+            "range": [
+                -2.1464968152866244,
+                0.1464968152866242
+            ],
+            "autorange": true
+        },
+        "height": 450,
+        "width": 1000,
+        "autosize": true
+    }
+}

image_server/test/test-images-baseline/line_grid_color.png

@@ -16,12 +16,19 @@
     "d3": "3.3.5",
     "delaunay-triangulate": "^1.1.6",
     "es6-promise": "^3.0.2",
+    "gl-error2d": "^1.0.0",
     "gl-error3d": "^1.0.0",
+    "gl-line2d": "^1.2.1",
     "gl-line3d": "^1.0.1",
     "gl-mat4": "^1.1.2",
     "gl-mesh3d": "^1.0.4",
+    "gl-plot2d": "^1.1.6",
     "gl-plot3d": "^1.3.0",
+    "gl-scatter2d": "^1.0.5",
+    "gl-scatter2d-fancy": "^1.1.1",
     "gl-scatter3d": "^1.0.4",
+    "gl-select-box": "^1.0.1",
+    "gl-spikes2d": "^1.0.1",
     "gl-surface3d": "^1.0.6",
     "mouse-change": "^1.1.1",
     "mouse-wheel": "^1.0.2",
@@ -30,6 +37,7 @@
     "ndarray-homography": "^1.0.0",
     "ndarray-ops": "^1.2.2",
     "right-now": "^1.0.0",
+    "robust-orientation": "^1.1.3",
     "superscript-text": "^1.0.0",
     "through2": "^2.0.0",
     "tinycolor2": "1.1.2",

image_server/test/test-images-baseline/line_grid_width.png

@@ -603,7 +603,7 @@ annotations.draw = function(gd, index, opt, value) {
         .style('opacity', options.opacity)
         .on('click', function() {
             gd._dragging = false;
-            $(gd).trigger('plotly_clickannotation', {
+            gd.emit('plotly_clickannotation', {
                 index: index,
                 annotation: optionsIn,
                 fullAnnotation: options