summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2015-10-29 10:39:56 +0100
committerGéry Debongnie <ged@odoo.com>2015-10-29 22:15:44 +0100
commit329552b78ee6c9efb8abc2a4a3c78f37d43871ac (patch)
tree6be9424aa96de7ef877ba1205bad111de9e05271 /addons/web/static/src/js/views
parent55535a6f61ba684e8d987ce92d9305bfb89c7acc (diff)
[FIX] web,account,website_links: update nvd3 to last version
This commit was necessary to fix weird problems in 9.0-nightly. Phantomjs and the old nvd3 implementations did not play well together. * transitionDuration() replaced by duration() * tooltips() & tooltipContent replaced by tooltip.enable and tooltip.contentGenerator * remove useless less for tooltip Thanks to mge for his help
Diffstat (limited to 'addons/web/static/src/js/views')
-rw-r--r--addons/web/static/src/js/views/form_widgets.js2
-rw-r--r--addons/web/static/src/js/views/graph_widget.js4
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(),
});