From 6928bfb6c7e7bffff5fc8855838a8b133c324c68 Mon Sep 17 00:00:00 2001
From: Vincent Schippefilt <vsc@odoo.com>
Date: Wed, 6 Mar 2019 14:02:36 +0100
Subject: [PATCH] [REF] website_links: 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>
---
 addons/website_links/static/src/js/website_links.js       | 4 ++--
 .../website_links/static/src/js/website_links_charts.js   | 8 +++++++-
 .../static/src/js/website_links_code_editor.js            | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/addons/website_links/static/src/js/website_links.js b/addons/website_links/static/src/js/website_links.js
index 5f42892919b..a7c49dfa86c 100644
--- a/addons/website_links/static/src/js/website_links.js
+++ b/addons/website_links/static/src/js/website_links.js
@@ -37,7 +37,7 @@ var SelectBox = publicWidget.Widget.extend({
                 return {id: val.id, text: val.name};
             });
         }));
-        return $.when.apply($, defs);
+        return Promise.all(defs);
     },
     /**
      * @override
@@ -376,7 +376,7 @@ publicWidget.registry.websiteLinks = publicWidget.Widget.extend({
 
         $('[data-toggle="tooltip"]').tooltip();
 
-        return $.when.apply($, defs);
+        return Promise.all(defs);
     },
 
     //--------------------------------------------------------------------------
diff --git a/addons/website_links/static/src/js/website_links_charts.js b/addons/website_links/static/src/js/website_links_charts.js
index c74191d36bf..d4604f1718e 100644
--- a/addons/website_links/static/src/js/website_links_charts.js
+++ b/addons/website_links/static/src/js/website_links_charts.js
@@ -177,7 +177,13 @@ publicWidget.registry.websiteLinksCharts = publicWidget.Widget.extend({
 
         this.animating_copy = false;
 
-        return $.when.apply($, defs).then(function (_totalClicks, _clicksByDay, _clicksByCountry, _lastWeekClicksByCountry, _lastMonthClicksByCountry) {
+        return Promise.all(defs).then(function (results) {
+            var _totalClicks = results[0];
+            var _clicksByDay = results[1];
+            var _clicksByCountry = results[2];
+            var _lastWeekClicksByCountry = results[3];
+            var _lastMonthClicksByCountry = results[4];
+
             if (!_totalClicks) {
                 $('#all_time_charts').prepend(_t("There is no data to show"));
                 $('#last_month_charts').prepend(_t("There is no data to show"));
diff --git a/addons/website_links/static/src/js/website_links_code_editor.js b/addons/website_links/static/src/js/website_links_code_editor.js
index e5ffda16892..b3c05bbf1a6 100644
--- a/addons/website_links/static/src/js/website_links_code_editor.js
+++ b/addons/website_links/static/src/js/website_links_code_editor.js
@@ -43,7 +43,7 @@ publicWidget.registry.websiteLinksCodeEditor = publicWidget.Widget.extend({
     },
     /**
      * @private
-     * @returns {Deferred}
+     * @returns {Promise}
      */
     _submitCode: function () {
         var initCode = $('#edit-code-form #init_code').val();
@@ -75,7 +75,7 @@ publicWidget.registry.websiteLinksCodeEditor = publicWidget.Widget.extend({
             });
         }
 
-        return $.when();
+        return Promise.resolve();
     },
 
     //--------------------------------------------------------------------------