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 | |
| parent | 23d7caa8d50de8b5307936af2750c2ffe9c82540 (diff) | |
| parent | 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d0 (diff) | |
[MERGE] Forward-port 9.0 up to 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d1
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/framework/data.js | 2 | ||||
| -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 | ||||
| -rw-r--r-- | addons/web/static/src/js/widgets/progress_bar.js | 3 |
4 files changed, 7 insertions, 4 deletions
diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js index 6aee8f06391..8dd34cd4b93 100644 --- a/addons/web/static/src/js/framework/data.js +++ b/addons/web/static/src/js/framework/data.js @@ -812,7 +812,7 @@ var BufferedDataSet = DataSetStatic.extend({ _.each(ids, function (id) { self.get_cache(id).to_delete = true; }); - this.set_ids(_.without(this.ids, _.pluck(_.filter(this.cache, function (c) {return c.to_delete;}), 'id'))); + this.set_ids(_.difference(this.ids, _.pluck(_.filter(this.cache, function (c) {return c.to_delete;}), 'id'))); this.trigger("dataset_changed", ids, callback, error_callback); return $.async_when({result: true}).done(callback); }, 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(), }); diff --git a/addons/web/static/src/js/widgets/progress_bar.js b/addons/web/static/src/js/widgets/progress_bar.js index abe1009b1fa..6ccd1e74f28 100644 --- a/addons/web/static/src/js/widgets/progress_bar.js +++ b/addons/web/static/src/js/widgets/progress_bar.js @@ -72,6 +72,9 @@ var ProgressBar = Widget.extend({ on_change_input: function(e) { var $input = $(e.target); + if(e.type === 'change' && !$input.is(':focus')) { + return; + } if(isNaN($input.val())) { this.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid.")); } else { |