Skip to content

Commit e531e4e

Browse files
committed
Merge remote-tracking branch 'origin/master' into 2630-mesh3d-dont-modify-messy-data
2 parents f1772a2 + 728eacc commit e531e4e

File tree

813 files changed

+4741
-4363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

813 files changed

+4741
-4363
lines changed

.eslintrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"max-len": [0, 80],
3030
"brace-style": [0, "stroustrup", {"allowSingleLine": true}],
3131
"curly": [2, "multi-line"],
32-
"camelcase": [0, {"properties": "never"}],
32+
"camelcase": [2, {"properties": "never"}],
3333
"comma-spacing": [2, {"before": false, "after": true}],
3434
"comma-style": [2, "last"],
3535
"semi": [2],
@@ -63,6 +63,7 @@
6363
"no-shadow": [0, {"builtinGlobals": true}],
6464
"block-scoped-var": [2],
6565
"no-unused-vars": [2],
66+
"one-var": [2, {"initialized": "never"}],
6667
"no-undef-init": [2],
6768
"no-use-before-define": [2, "nofunc"],
6869
"no-loop-func": [2],

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2018 Plotly, Inc
3+
Copyright (c) 2019 Plotly, Inc
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion

devtools/image_viewer/viewer.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ var path = require('path');
33

44
var d3 = require('d3');
55

6-
var $plotlist = document.getElementById('plot-list'),
7-
$toggles = document.getElementById('plot-toggles'),
8-
$images = document.getElementById('plot-images'),
9-
$mock = document.getElementById('plot-mock'),
10-
$toggleBaseline = document.createElement('button'),
11-
$toggleTest = document.createElement('button'),
12-
$toggleDiff = document.createElement('button'),
13-
$imgBaseline = document.createElement('img'),
14-
$imgTest = document.createElement('img'),
15-
$imgDiff = document.createElement('img');
6+
var $plotlist = document.getElementById('plot-list');
7+
var $toggles = document.getElementById('plot-toggles');
8+
var $images = document.getElementById('plot-images');
9+
var $mock = document.getElementById('plot-mock');
10+
var $toggleBaseline = document.createElement('button');
11+
var $toggleTest = document.createElement('button');
12+
var $toggleDiff = document.createElement('button');
13+
var $imgBaseline = document.createElement('img');
14+
var $imgTest = document.createElement('img');
15+
var $imgDiff = document.createElement('img');
1616

1717
$toggles.style.display = 'none';
1818
$images.style.display = 'none';
@@ -21,13 +21,13 @@ setupToggle($toggleBaseline, $imgBaseline, 'Baseline');
2121
setupToggle($toggleTest, $imgTest, 'Test');
2222
setupToggle($toggleDiff, $imgDiff, 'Diff');
2323

24-
var pathToRoot = path.join(__dirname, '../../'),
25-
pathToImageTest = path.join(pathToRoot, 'test/image'),
26-
pathToBuild = path.join(pathToRoot, 'build/'),
27-
dirMocks = path.join(pathToImageTest, 'mocks/'),
28-
dirBaseline = path.join(pathToImageTest, 'baselines/'),
29-
dirTest = path.join(pathToBuild, 'test_images/'),
30-
dirDiff = path.join(pathToBuild, 'test_images_diff/');
24+
var pathToRoot = path.join(__dirname, '../../');
25+
var pathToImageTest = path.join(pathToRoot, 'test/image');
26+
var pathToBuild = path.join(pathToRoot, 'build/');
27+
var dirMocks = path.join(pathToImageTest, 'mocks/');
28+
var dirBaseline = path.join(pathToImageTest, 'baselines/');
29+
var dirTest = path.join(pathToBuild, 'test_images/');
30+
var dirDiff = path.join(pathToBuild, 'test_images_diff/');
3131

3232
// N.B. brfs only understand hard-coded paths
3333
var imageNames = fs.readFileSync(

devtools/test_dashboard/devtools.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ searchBar.addEventListener('keyup', debounce(searchMocks, 250));
179179
function debounce(func, wait, immediate) {
180180
var timeout;
181181
return function() {
182-
var context = this, args = arguments;
182+
var context = this;
183+
var args = arguments;
183184
var later = function() {
184185
timeout = null;
185186
if(!immediate) func.apply(context, args);

lib/aggregate.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2018, Plotly, Inc.
2+
* Copyright 2012-2019, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

lib/bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2018, Plotly, Inc.
2+
* Copyright 2012-2019, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

lib/barpolar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2018, Plotly, Inc.
2+
* Copyright 2012-2019, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

lib/box.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2018, Plotly, Inc.
2+
* Copyright 2012-2019, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

lib/calendars.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2012-2018, Plotly, Inc.
2+
* Copyright 2012-2019, Plotly, Inc.
33
* All rights reserved.
44
*
55
* This source code is licensed under the MIT license found in the

0 commit comments

Comments
 (0)