Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 12bec07

Browse files
archmojarchmoj
committed
Merge remote-tracking branch 'origin/master' into no-substr
2 parents 5d4b308 + 13a3773 commit 12bec07

File tree

7 files changed

+15
-17
lines changed

7 files changed

+15
-17
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"use-draftlogs": "node tasks/use_draftlogs.js",
3333
"empty-draftlogs": "node tasks/empty_draftlogs.js",
3434
"empty-dist": "node tasks/empty_dist.js",
35-
"build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles basic && npm run extra-bundles cartesian && npm run extra-bundles geo && npm run extra-bundles gl2d && npm run extra-bundles gl3d && npm run extra-bundles mapbox && npm run extra-bundles finance && npm run locales && npm run schema dist && npm run replace-substr && npm run stats",
3635
"replace-substr": "node ./tasks/replace_substr.js",
36+
"build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles && npm run locales && npm run schema dist && npm run replace-substr && npm run stats",
3737
"regl-codegen": "node devtools/regl_codegen/server.js",
3838
"cibuild": "npm run empty-dist && npm run preprocess && node tasks/cibundle.js && npm run replace-substr -- build",
3939
"watch": "node tasks/watch.js",

‎src/traces/treemap/attributes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ module.exports = {
4646
dflt: 1,
4747
editType: 'plot',
4848
description: [
49-
'When using *squarify* `packing` algorithm, according to https://github.com/d3/d3-hierarchy/blob/master/README.md#squarify_ratio',
49+
'When using *squarify* `packing` algorithm, according to https://github.com/d3/d3-hierarchy/blob/v3.1.1/README.md#squarify_ratio',
5050
'this option specifies the desired aspect ratio of the generated rectangles.',
5151
'The ratio must be specified as a number greater than or equal to one.',
5252
'Note that the orientation of the generated rectangles (tall or wide)',

‎tasks/bundle.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ tasks.push(function(done) {
3737
standalone: 'Plotly',
3838
pathToMinBundle: pathToPlotlyDistMin
3939
}, function() {
40-
prependFile(pathToPlotlyDist, header, common.throwOnError);
41-
prependFile(pathToPlotlyDistMin, header, common.throwOnError);
40+
prependFile.sync(pathToPlotlyDist, header, common.throwOnError);
41+
prependFile.sync(pathToPlotlyDistMin, header, common.throwOnError);
4242

4343
done();
4444
});
@@ -50,8 +50,8 @@ tasks.push(function(done) {
5050
standalone: 'Plotly',
5151
pathToMinBundle: pathToPlotlyStrictDistMin
5252
}, function() {
53-
prependFile(pathToPlotlyStrictDist, header, common.throwOnError);
54-
prependFile(pathToPlotlyStrictDistMin, header, common.throwOnError);
53+
prependFile.sync(pathToPlotlyStrictDist, header.replace('plotly.js', 'plotly.js (strict)'), common.throwOnError);
54+
prependFile.sync(pathToPlotlyStrictDistMin, header.replace('plotly.js', 'plotly.js (strict - minified)'), common.throwOnError);
5555

5656
done();
5757
});
@@ -62,7 +62,7 @@ tasks.push(function(done) {
6262
_bundle(pathToPlotlyGeoAssetsSrc, pathToPlotlyGeoAssetsDist, {
6363
standalone: 'PlotlyGeoAssets'
6464
}, function() {
65-
prependFile(pathToPlotlyGeoAssetsDist, header, common.throwOnError);
65+
prependFile.sync(pathToPlotlyGeoAssetsDist, header, common.throwOnError);
6666

6767
done();
6868
});
@@ -74,7 +74,7 @@ tasks.push(function(done) {
7474
standalone: 'Plotly',
7575
noCompress: true
7676
}, function() {
77-
prependFile(pathToPlotlyDistWithMeta, header, common.throwOnError);
77+
prependFile.sync(pathToPlotlyDistWithMeta, header, common.throwOnError);
7878

7979
done();
8080
});

‎tasks/extra_bundles.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ var tasks = [];
3030
for(var i = 0; i < list.length; i++) {
3131
var opts = list[i];
3232

33+
// strict bundle is no longer a partial bundle and generated with bundles
34+
if(opts.name === 'strict') continue;
35+
3336
partialBundle(tasks, {
3437
name: opts.name,
3538
index: opts.index,

‎tasks/partial_bundle.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ module.exports = function partialBundle(tasks, opts) {
6363
var headerDist = header.replace('plotly.js', 'plotly.js (' + name + ')');
6464
var headerDistMin = header.replace('plotly.js', 'plotly.js (' + name + ' - minified)');
6565

66-
if(dist) prependFile(dist, headerDist, common.throwOnError);
67-
if(distMin) prependFile(distMin, headerDistMin, common.throwOnError);
66+
if(dist) prependFile.sync(dist, headerDist, common.throwOnError);
67+
if(distMin) prependFile.sync(distMin, headerDistMin, common.throwOnError);
6868

6969
done();
7070
});

‎test/jasmine/karma.conf.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,24 +313,19 @@ func.defaultConfig = {
313313
};
314314

315315
func.defaultConfig.preprocessors[pathToCustomMatchers] = ['browserify'];
316+
func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
316317

317318
if(isBundleTest) {
318319
switch(basename(testFileGlob)) {
319320
case 'minified_bundle':
320321
func.defaultConfig.files.push(constants.pathToPlotlyBuildMin);
321-
func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
322322
break;
323323
case 'plotschema':
324324
func.defaultConfig.browserify.ignoreTransform = './tasks/compress_attributes.js';
325-
func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
326-
break;
327-
default:
328-
func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
329325
break;
330326
}
331327
} else {
332328
func.defaultConfig.files.push(pathToJQuery);
333-
func.defaultConfig.preprocessors[testFileGlob] = ['browserify'];
334329
}
335330

336331
// lastly, load test file glob

‎test/plot-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68075,7 +68075,7 @@
6807568075
},
6807668076
"role": "object",
6807768077
"squarifyratio": {
68078-
"description": "When using *squarify* `packing` algorithm, according to https://github.com/d3/d3-hierarchy/blob/master/README.md#squarify_ratio this option specifies the desired aspect ratio of the generated rectangles. The ratio must be specified as a number greater than or equal to one. Note that the orientation of the generated rectangles (tall or wide) is not implied by the ratio; for example, a ratio of two will attempt to produce a mixture of rectangles whose width:height ratio is either 2:1 or 1:2. When using *squarify*, unlike d3 which uses the Golden Ratio i.e. 1.618034, Plotly applies 1 to increase squares in treemap layouts.",
68078+
"description": "When using *squarify* `packing` algorithm, according to https://github.com/d3/d3-hierarchy/blob/v3.1.1/README.md#squarify_ratio this option specifies the desired aspect ratio of the generated rectangles. The ratio must be specified as a number greater than or equal to one. Note that the orientation of the generated rectangles (tall or wide) is not implied by the ratio; for example, a ratio of two will attempt to produce a mixture of rectangles whose width:height ratio is either 2:1 or 1:2. When using *squarify*, unlike d3 which uses the Golden Ratio i.e. 1.618034, Plotly applies 1 to increase squares in treemap layouts.",
6807968079
"dflt": 1,
6808068080
"editType": "plot",
6808168081
"min": 1,

0 commit comments

Comments
 (0)