[REF] web: adapt code after jQuery update

Part of task 1896658

Co-authored-by: Aaron Bohy <aab@odoo.com>
Co-authored-by: Christophe Matthieu <chm@odoo.com>
Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com>
Co-authored-by: David Monjoie <dmo@odoo.com>
Co-authored-by: Martin Geubelle <mge@odoo.com>
Co-authored-by: svs-odoo <svs@odoo.com>
Co-authored-by: Vincent Schippefilt <vsc@odoo.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/addons/web/static/src/js/views/pivot/pivot_model.js b/addons/web/static/src/js/views/pivot/pivot_model.js
index 3f195c1ea24..a4a2bae8fb0 100644
--- a/addons/web/static/src/js/views/pivot/pivot_model.js
+++ b/addons/web/static/src/js/views/pivot/pivot_model.js
@@ -45,10 +45,10 @@ var PivotModel = AbstractModel.extend({
 
     /**
      * Close a header. This method is actually synchronous, but returns a
-     * deferred.
+     * promise.
      *
      * @param {any} headerID
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     closeHeader: function (headerID) {
         var header = this.data.headers[headerID];
@@ -58,7 +58,7 @@ var PivotModel = AbstractModel.extend({
         header.root.groupbys.splice(newGroupbyLength);
     },
     /**
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     expandAll: function () {
         return this._loadData();
@@ -118,8 +118,8 @@ var PivotModel = AbstractModel.extend({
                     });
             }));
         }
-        return $.when.apply(null, defs).then(function () {
-            var results = Array.prototype.slice.call(arguments);
+        return Promise.all(defs).then(function () {
+            var results = Array.prototype.slice.call(arguments[0]);
             var data = [];
             var comparisonData = [];
             _.each(results, function (result) {
@@ -358,7 +358,7 @@ var PivotModel = AbstractModel.extend({
      * @param {string[]} params.compare
      * @param {Object} params.fields
      * @param {string} params.default_order
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     load: function (params) {
         var self = this;
@@ -394,7 +394,7 @@ var PivotModel = AbstractModel.extend({
      * @override
      * @param {any} handle this parameter is ignored
      * @param {Object} params
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     reload: function (handle, params) {
         var self = this;
@@ -507,14 +507,14 @@ var PivotModel = AbstractModel.extend({
      * Toggle the active state for a given measure, then reload the data.
      *
      * @param {string} field
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     toggleMeasure: function (field) {
         if (_.contains(this.data.measures, field)) {
             this.data.measures = _.without(this.data.measures, field);
             // in this case, we already have all data in memory, no need to
             // actually reload a lesser amount of information
-            return $.when();
+            return Promise.resolve();
         } else {
             this.data.measures.push(field);
         }
@@ -705,7 +705,7 @@ var PivotModel = AbstractModel.extend({
         return result;
     },
     /**
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     _loadData: function () {
         var self = this;
@@ -755,8 +755,7 @@ var PivotModel = AbstractModel.extend({
             }));
         }
 
-        return this._loadDataDropPrevious.add($.when.apply(null, defs)).then(function () {
-            var results = Array.prototype.slice.call(arguments);
+        return this._loadDataDropPrevious.add(Promise.all(defs)).then(function (results) {
             var data = [];
             var comparisonData = [];
             _.each(results, function (result) {