Skip to content

Commit 79b00ab

Browse files
committed
Merge branch 'master' into pie_title
2 parents 4676fd8 + ff3c324 commit 79b00ab

File tree

123 files changed

+7417
-4211
lines changed

Some content is hidden

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

123 files changed

+7417
-4211
lines changed

.circleci/config.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version: 2.0
1010
jobs:
1111
build:
1212
docker:
13-
- image: circleci/node:8.9.4
13+
- image: circleci/node:10.9.0
1414
working_directory: ~/plotly.js
1515
steps:
1616
- checkout
@@ -47,33 +47,25 @@ jobs:
4747
test-jasmine:
4848
docker:
4949
# need '-browsers' version to test in real (xvfb-wrapped) browsers
50-
- image: circleci/node:8.9.4-browsers
50+
- image: circleci/node:10.9.0-browsers
5151
working_directory: ~/plotly.js
5252
steps:
5353
- checkout
5454
- attach_workspace:
5555
at: ~/plotly.js
56-
- run:
57-
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
58-
command: |
59-
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
6056
- run:
6157
name: Run jasmine tests (batch 1)
6258
command: ./.circleci/test.sh jasmine
6359

6460
test-jasmine2:
6561
docker:
6662
# need '-browsers' version to test in real (xvfb-wrapped) browsers
67-
- image: circleci/node:8.9.4-browsers
63+
- image: circleci/node:10.9.0-browsers
6864
working_directory: ~/plotly.js
6965
steps:
7066
- checkout
7167
- attach_workspace:
7268
at: ~/plotly.js
73-
- run:
74-
name: Set timezone to Alaska time (arbitrary timezone to test date logic)
75-
command: |
76-
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
7769
- run:
7870
name: Run jasmine tests (batch 2)
7971
command: ./.circleci/test.sh jasmine2
@@ -118,7 +110,7 @@ jobs:
118110

119111
test-syntax:
120112
docker:
121-
- image: circleci/node:8.9.4
113+
- image: circleci/node:10.9.0
122114
working_directory: ~/plotly.js
123115
steps:
124116
- checkout

.circleci/test.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,27 @@ retry () {
3333
fi
3434
}
3535

36+
# set timezone to Alaska time (arbitrary timezone to test date logic)
37+
set_tz () {
38+
sudo cp /usr/share/zoneinfo/America/Anchorage /etc/localtime
39+
export TZ='America/Anchorage'
40+
}
41+
3642
case $1 in
3743

3844
jasmine)
45+
set_tz
46+
3947
npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$?
4048
retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI
4149
npm run test-bundle || EXIT_STATE=$?
50+
4251
exit $EXIT_STATE
4352
;;
4453

4554
jasmine2)
55+
set_tz
56+
4657
SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=gl))
4758

4859
for s in ${SHARDS[@]}; do

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ We use the following [labels](https://github.com/plotly/plotly.js/labels) to tra
3434
#### Prerequisites
3535

3636
- git
37-
- [node.js](https://nodejs.org/en/). We recommend using node.js v8.x, but all
37+
- [node.js](https://nodejs.org/en/). We recommend using node.js v10.x, but all
3838
versions starting from v6 should work. Upgrading and managing node versions
3939
can be easily done using [`nvm`](https://github.com/creationix/nvm) or its
4040
Windows alternatives.
41-
- [`npm`](https://www.npmjs.com/) v5.x and up (which ships by default with
42-
node.js v8.x) to ensure that the
41+
- [`npm`](https://www.npmjs.com/) v6.x and up (which ships by default with
42+
node.js v10.x) to ensure that the
4343
[`package-lock.json`](https://docs.npmjs.com/files/package-lock.json) file is
4444
used and updated correctly.
4545

lib/barpolar.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright 2012-2018, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
'use strict';
10+
11+
module.exports = require('../src/traces/barpolar');

lib/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Plotly.register([
5353
require('./candlestick'),
5454

5555
require('./scatterpolar'),
56-
require('./scatterpolargl')
56+
require('./scatterpolargl'),
57+
require('./barpolar')
5758
]);
5859

5960
// transforms

lib/locales/cy.js

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
/**
2+
* Copyright 2012-2018, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
'use strict';
10+
11+
module.exports = {
12+
moduleType: 'locale',
13+
name: 'cy',
14+
dictionary: {
15+
'Autoscale': 'Graddfa awtomatig', // components / modebar / buttons.js: 150
16+
'Box Select': 'Dewiswch â blwch', // components / modebar / buttons.js: 114
17+
'Click to enter Colorscale title': 'Cliciwch i nodi teitl Graddfa Liw', // plots / plots.js: 327
18+
'Click to enter Component A title': 'Cliciwch i nodi teitl Cydran A', // plots / ternary / ternary.js: 390
19+
'Click to enter Component B title': 'Cliciwch i nodi teitl Cydran B', // plots / ternary / ternary.js: 405
20+
'Click to enter Plot title': 'Cliciwch i nodi teitl y Plot', // plot_api / plot_api.js: 513
21+
'Click to enter Component C title': 'Cliciwch i nodi teitl Cydran C', // plot / ternary / ternary.js: 416
22+
'Click to enter X axis title': 'Cliciwch i nodi teitl echelin X', // plots.js: 325
23+
'Click to enter Y axis title': 'Cliciwch i nodi teitl echelin Y', // plots / plots.js: 326
24+
'Click to enter radial axis title': 'Cliciwch i nodi teitl echelin reiddiol', // plots / polar / polar.js: 408
25+
'Compare data on hover': 'Cymharwch ddata wrth hofran', // components / modebar / buttons.js: 178
26+
'Double-click on legend to isolate one trace': 'Dwbl-gliciwch ar yr allwedd i neilltuo un llinell', // components / legend / handle_click.js: 89
27+
'Double-click to zoom back out': 'Dwbl-gliciwch i chwyddo\'n ôl', // plots / cartesian / dragbox.js: 1011
28+
'Download plot': 'Lawrlwythwch blot', // components / modebar / buttons.js: 55
29+
'Download plot as a png': 'Lawrlwythwch y plot fel png', // components / modebar / buttons.js: 54
30+
'Edit in Chart Studio': 'Golygu yn Chart Studio', // components / modebar / buttons.js: 87
31+
'IE only supports svg. Changing format to svg.': 'Dim ond svg mae IE yn ei gefnogi. Newid fformat i svg.', // components / modebar / buttons.js: 65
32+
'Lasso Select': 'Dewiswch â lasŵ', // components / modebar / buttons.js: 123
33+
'Orbital rotation': 'Cylchdroi orbital', // components / modebar / buttons.js: 287
34+
'Pan': 'Pan', // components / modebar / buttons.js: 105
35+
'Produced with Plotly': 'Cynhyrchwyd gyda Plotly', // components / modebar / modebar.js: 272
36+
'Reset': 'Ailosod', // components / modebar / buttons.js: 443
37+
'Reset axes': 'Ailosod echelinau', // components / modebar / buttons.js: 159
38+
'Reset camera to default': 'Ailosod camera i\'r rhagosodiad', // components / modebar / buttons.js: 325
39+
'Reset camera to last save': 'Ailosod camera i\'r cadw diwethaf', // components / modebar / buttons.js: 333
40+
'Reset view': 'Ailosodwch y golwg', // components / modebar / buttons.js: 592
41+
'Reset views': 'Ailosod olygfeydd', // components / modebar / buttons.js: 540
42+
'Show closest data on hover': 'Dangos y data agosaf wrth hofran', // components / modebar / buttons.js: 168
43+
'Snapshot succeeded': 'Llwyddodd y Ciplun', // components / modebar / buttons.js: 77
44+
'Sorry, there was a problem downloading your snapshot!': 'Mae\'n ddrwg gennym, roedd problem wrth lawrlwytho eich ciplun!', // components / modebar / buttons.js: 80
45+
'Taking snapshot - this may take a few seconds': 'Tynnu ciplun - gallai hyn gymryd ychydig o eiliadau', // components / modebar / buttons.js: 62
46+
'Toggle Spike Lines': 'Toglo llinellau pigog', // components / modebar / buttons.js: 559
47+
'Toggle show closest data on hover': 'Toglo dangos y data agosaf wrth hofran', // components / modebar / buttons.js: 364
48+
'Turntable rotation': 'Cylchdroi trofwrdd', // components / modebar / buttons.js: 296
49+
'Zoom': 'Chwyddo', // components / modebar / buttons.js: 96
50+
'Zoom in': 'Closio', // components / modebar / buttons.js
51+
'Zoom out': 'Cilio', // components / modebar / buttons.js: 141
52+
'close:': 'cau:', // traces / ohlc / calc.js: 104
53+
'high:': 'uchel:', // traces/ ohlc / calc.js: 102
54+
'incoming flow count:': 'cyfrif llif sy\'n dod i mewn:', // traces / sankey / plot.js: 142
55+
'kde:': 'kde:', // traces / violin / calc.js: 69
56+
'lat:': 'lledred:', // traces / scattergeo / calc.js: 48
57+
'lon:': 'hydred', // traces / scattergeo / calc.js: 49
58+
'low:': 'isel:', // traces / ohlc / calc.js: 103
59+
'lower fence:': 'ffens isaf:', // traces / box / calc.js: 140
60+
'max:': 'uchafbwynt:', // traces / box / calc.js: 138
61+
'mean ± σ:': 'cymedr ± σ:', // traces / box / calc.js: 139
62+
'mean:': 'cymedr:', // traces / box / calc.js: 139
63+
'median:': 'canolrif:', // traces / box / calc.js: 134
64+
'min:': 'isafbwynt:', // traces / box / calc.js: 135
65+
'new text': 'testun newydd', // plots / plots.js: 328
66+
'open:': 'agor:', // traces / ohlc / calc.js: 101
67+
'outgoing flow count:': 'cyfrif llif sy\'n mynd allan:', // traces / sankey / plot.js: 143
68+
'q1:': 'q1:', // traces / box / calc.js: 136
69+
'q3:': 'q3:', // traces / box / calc.js: 137
70+
'source:': 'ffynhonnell:', // traces / sankey / plot.js: 140
71+
'target:': 'targed:', // traces / sankey / plot.js: 141
72+
'trace': 'olin', // plots / plots.js: 330
73+
'upper fence:': 'ffens uchaf:' // traces / box / calc.js: 141
74+
},
75+
format: {
76+
days: ['Dydd Sul', 'Dydd Llun', 'Dydd Mawrth', 'Dydd Mercher', 'Dydd Iau', 'Dydd Gwener', 'Dydd Sadwrn'],
77+
shortDays: ['Sul', 'Llun', 'Maw', 'Mer', 'Iau', 'Gwen', 'Sad'],
78+
months: [
79+
'Ionawr', 'Chwefror', 'Mawrth', 'Ebrill', 'Mai', 'Mehefin',
80+
'Gorffennaf', 'Awst', 'Medi', 'Hydref', 'Tachwedd', 'Rhagfyr'
81+
],
82+
shortMonths: [
83+
'Ion', 'Chw', 'Maw', 'Ebr', 'Mai', 'Meh',
84+
'Gor', 'Awst', 'Medi', 'Hyd', 'Tach', 'Rhag'
85+
],
86+
date: '%d/%m/%Y'
87+
}
88+
};

0 commit comments

Comments
 (0)