diff options
| author | Olivier Dony <odo@openerp.com> | 2015-10-30 10:46:57 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2015-10-30 10:47:13 +0100 |
| commit | ff2069eb69213651a8f77ea7252ba8dc3a708dd7 (patch) | |
| tree | 9294cf27839f0de29f946650fd800138304f502f /addons/web/static/src/js/views | |
| parent | 23d7caa8d50de8b5307936af2750c2ffe9c82540 (diff) | |
| parent | 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d0 (diff) | |
[MERGE] Forward-port 9.0 up to 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d1
Diffstat (limited to 'addons/web/static/src/js/views')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/graph_widget.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 53e49c4d905..c27c5982cbb 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -780,7 +780,7 @@ var FieldBarChart = common.AbstractField.extend({ .margin({top: 0, right: 0, bottom: 0, left: 0}) .tooltips(false) .showValues(false) - .transitionDuration(350) + .transition(350) .showXAxis(false) .showYAxis(false); diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js index aaeb8404f94..989db33c289 100644 --- a/addons/web/static/src/js/views/graph_widget.js +++ b/addons/web/static/src/js/views/graph_widget.js @@ -158,7 +158,7 @@ return Widget.extend({ var chart = nv.models.multiBarChart(); chart.options({ delay: 250, - transitionDuration: 10, + transition: 10, showLegend: true, showXAxis: true, showYAxis: true, @@ -212,7 +212,7 @@ return Widget.extend({ var chart = nv.models.pieChart(); chart.options({ delay: 250, - transitionDuration: 100, + transition: 100, color: d3.scale.category10().range(), }); |