Skip to content

Commit e3bfbde

Browse files
yujin-wuyujin-wu
committed
further lint fixes, and restored try { behavior in prepareRegl
1 parent 43031cf commit e3bfbde

File tree

7 files changed

+64
-55
lines changed

7 files changed

+64
-55
lines changed

‎devtools/regl_codegen/server.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var minimist = require('minimist');
99
var constants = require('../../tasks/util/constants');
1010
var makeWatchifiedBundle = require('../../tasks/util/watchified_bundle');
1111
var shortcutPaths = require('../../tasks/util/shortcut_paths');
12-
const { exit } = require('process');
12+
var { exit } = require('process');
1313

1414
var args = minimist(process.argv.slice(2), {});
1515
var PORT = args.port || 3000;
@@ -67,7 +67,7 @@ var devtools = browserify(path.join(devtoolsPath, 'devtools.js'), {
6767
// Start the server up!
6868
server.listen(PORT);
6969

70-
const reglTraceList = getReglTraces();
70+
var reglTraceList = getReglTraces();
7171
purgeGeneratedCode(reglTraceList);
7272

7373
// Build and bundle all the things!
@@ -94,7 +94,7 @@ function getMockFiles() {
9494

9595
function getReglTraces() {
9696
return constants.allTraces.filter(function (trace) {
97-
var indexPath = constants.pathToSrc + "/traces/" + trace + "/index.js";
97+
var indexPath = constants.pathToSrc + '/traces/' + trace + '/index.js';
9898

9999
// get categories
100100
var indexContents = fs.readFileSync(indexPath, 'utf8');
@@ -212,16 +212,17 @@ function handleCodegen(data) {
212212
var pathToReglCodegenSrc = constants.pathToReglCodegenSrc;
213213
var pathToReglPrecompiledSrc = path.join(constants.pathToSrc, 'traces', trace, 'regl_precompiled.js');
214214

215-
var imports = "";
216-
var exports = "\nmodule.exports = {\n";
215+
var header = "'use strict';\n";
216+
var imports = '';
217+
var exports = '\nmodule.exports = {\n';
217218
var varId = 0;
218219

219220
Object.entries(generated).forEach(function ([key, value], i) {
220221
var filePath = path.join(pathToReglCodegenSrc, key);
221222
fs.writeFileSync(filePath, 'module.exports = ' + value);
222223

223-
imports += "var v" + varId + " = require('../../" + path.join(constants.reglCodegenSubdir, key) + "');\n";
224-
exports += ' "' + key + '": v' + varId + ',\n';
224+
imports += 'var v' + varId + " = require('../../" + path.join(constants.reglCodegenSubdir, key) + "');\n";
225+
exports += " '" + key + "': v" + varId + ',\n';
225226
varId++;
226227
});
227228

@@ -231,7 +232,7 @@ function handleCodegen(data) {
231232
exports = 'module.exports = {};\n';
232233
}
233234

234-
var precompiled = imports + exports;
235+
var precompiled = header + imports + exports;
235236
fs.writeFileSync(pathToReglPrecompiledSrc, precompiled);
236237
}
237238

‎src/lib/prepare_regl.js‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,20 @@ module.exports = function prepareRegl(gd, extensions, reglPrecompiled) {
3030
// only parcoords needs pick layer
3131
if(d.pick && !fullLayout._has('parcoords')) return;
3232

33-
d.regl = createRegl({
34-
canvas: this,
35-
attributes: {
36-
antialias: !d.pick,
37-
preserveDrawingBuffer: true
38-
},
39-
pixelRatio: gd._context.plotGlPixelRatio || global.devicePixelRatio,
40-
extensions: extensions || [],
41-
cachedCode: reglPrecompiled || {}
42-
});
33+
try {
34+
d.regl = createRegl({
35+
canvas: this,
36+
attributes: {
37+
antialias: !d.pick,
38+
preserveDrawingBuffer: true
39+
},
40+
pixelRatio: gd._context.plotGlPixelRatio || global.devicePixelRatio,
41+
extensions: extensions || [],
42+
cachedCode: reglPrecompiled || {}
43+
});
44+
} catch(e) {
45+
success = false;
46+
}
4347

4448
if(!d.regl) success = false;
4549

‎src/traces/parcoords/regl_precompiled.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
'use strict';
12
var v0 = require('../../generated/regl-codegen/ba9c72c3a822cee4488d9271ba24413359ece2c6a8f187c5d15a454004f4b635');
23
var v1 = require('../../generated/regl-codegen/4df455b48c9de7d9f1de4b9481b505c09613ba7f90d2b4e360e673839566688e');
34
var v2 = require('../../generated/regl-codegen/59568c77bcbe6343ee6109df49ceeb78c8a8a8a81872e88fb077f9a3d6dc0567');
45
var v3 = require('../../generated/regl-codegen/c759965c8d66b2b356ae7455825df829f2ba7d4e7e903236f8c8d3bc5f45bd44');
56

67
module.exports = {
7-
"ba9c72c3a822cee4488d9271ba24413359ece2c6a8f187c5d15a454004f4b635": v0,
8-
"4df455b48c9de7d9f1de4b9481b505c09613ba7f90d2b4e360e673839566688e": v1,
9-
"59568c77bcbe6343ee6109df49ceeb78c8a8a8a81872e88fb077f9a3d6dc0567": v2,
10-
"c759965c8d66b2b356ae7455825df829f2ba7d4e7e903236f8c8d3bc5f45bd44": v3
8+
'ba9c72c3a822cee4488d9271ba24413359ece2c6a8f187c5d15a454004f4b635': v0,
9+
'4df455b48c9de7d9f1de4b9481b505c09613ba7f90d2b4e360e673839566688e': v1,
10+
'59568c77bcbe6343ee6109df49ceeb78c8a8a8a81872e88fb077f9a3d6dc0567': v2,
11+
'c759965c8d66b2b356ae7455825df829f2ba7d4e7e903236f8c8d3bc5f45bd44': v3
1112
};

‎src/traces/scattergl/regl_precompiled.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var v0 = require('../../generated/regl-codegen/7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997');
23
var v1 = require('../../generated/regl-codegen/8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770');
34
var v2 = require('../../generated/regl-codegen/ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce');
@@ -10,14 +11,14 @@ var v8 = require('../../generated/regl-codegen/6c3ff5a68d2906faf59307b58a799389f
1011
var v9 = require('../../generated/regl-codegen/7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4');
1112

1213
module.exports = {
13-
"7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997": v0,
14-
"8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770": v1,
15-
"ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce": v2,
16-
"21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316": v3,
17-
"f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956": v4,
18-
"0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc": v5,
19-
"13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260": v6,
20-
"19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13": v7,
21-
"6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc": v8,
22-
"7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4": v9
14+
'7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997': v0,
15+
'8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770': v1,
16+
'ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce': v2,
17+
'21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316': v3,
18+
'f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956': v4,
19+
'0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc': v5,
20+
'13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260': v6,
21+
'19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13': v7,
22+
'6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc': v8,
23+
'7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4': v9
2324
};

‎src/traces/scatterpolargl/regl_precompiled.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var v0 = require('../../generated/regl-codegen/7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997');
23
var v1 = require('../../generated/regl-codegen/8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770');
34
var v2 = require('../../generated/regl-codegen/ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce');
@@ -10,14 +11,14 @@ var v8 = require('../../generated/regl-codegen/6c3ff5a68d2906faf59307b58a799389f
1011
var v9 = require('../../generated/regl-codegen/7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4');
1112

1213
module.exports = {
13-
"7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997": v0,
14-
"8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770": v1,
15-
"ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce": v2,
16-
"21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316": v3,
17-
"f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956": v4,
18-
"0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc": v5,
19-
"13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260": v6,
20-
"19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13": v7,
21-
"6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc": v8,
22-
"7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4": v9
14+
'7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997': v0,
15+
'8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770': v1,
16+
'ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce': v2,
17+
'21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316': v3,
18+
'f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956': v4,
19+
'0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc': v5,
20+
'13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260': v6,
21+
'19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13': v7,
22+
'6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc': v8,
23+
'7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4': v9
2324
};

‎src/traces/splom/base_plot_strict.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var base_plot = require('./base_plot');
3+
var basePlot = require('./base_plot');
44
var reglPrecompiled = require('./regl_precompiled');
55

6-
Object.assign(base_plot.reglPrecompiled, reglPrecompiled);
6+
Object.assign(basePlot.reglPrecompiled, reglPrecompiled);
77

88

9-
module.exports = base_plot;
9+
module.exports = basePlot;

‎src/traces/splom/regl_precompiled.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
'use strict';
12
var v0 = require('../../generated/regl-codegen/7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997');
23
var v1 = require('../../generated/regl-codegen/8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770');
34
var v2 = require('../../generated/regl-codegen/ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce');
@@ -10,14 +11,14 @@ var v8 = require('../../generated/regl-codegen/6c3ff5a68d2906faf59307b58a799389f
1011
var v9 = require('../../generated/regl-codegen/7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4');
1112

1213
module.exports = {
13-
"7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997": v0,
14-
"8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770": v1,
15-
"ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce": v2,
16-
"13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260": v3,
17-
"19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13": v4,
18-
"21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316": v5,
19-
"f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956": v6,
20-
"0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc": v7,
21-
"6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc": v8,
22-
"7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4": v9
14+
'7a5bb1985cc7db0a7544e23c660c9dc27a2e4053572e95d457a7e52fd4980997': v0,
15+
'8a43b073e4f3e9c0e499c8ac9c253f2aa1e3d3de2febfccc6526b52295dbf770': v1,
16+
'ff8495670417d5d0e4caa9942ad63b4dff0242a390ac1cb807c78ca326d6f3ce': v2,
17+
'13c0ae156483f2bcbd7ff29404f0abfd8689ff43f41791a6c7469868690a4260': v3,
18+
'19769c875db736c08a744c0a6aabe28276ed06aa24fdb7c36506a9f4c1f56f13': v4,
19+
'21cec01aa93887c70e86d7f1bc84d6837da0b1f5c1ff4cadd42ac6eb37f9f316': v5,
20+
'f9448a214a3e3cd439b767559aa71a4d1ccf5a8f39b8b756973e71acd33ff956': v6,
21+
'0919c57b995304312da30a5af7873a319bfb7b7e22ff6b4fa203ecbd5774ebfc': v7,
22+
'6c3ff5a68d2906faf59307b58a799389f916ebdd3f7732ce75967575041988fc': v8,
23+
'7c8e7f36e693904898ece5f7f8b49b23c69d98397567c3915a45647209eb7da4': v9
2324
};

0 commit comments

Comments
 (0)