summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/content
diff options
context:
space:
mode:
authorVincent Schippefilt <vsc@odoo.com>2019-03-06 14:02:33 +0100
committerAaron Bohy <aab@odoo.com>2019-03-06 20:07:17 +0100
commit226a6a9e677b1ebded9240e181cc2ea83fa49d72 (patch)
treedb1caaa11b9905589031b10580db28a5486b2b20 /addons/website/static/src/js/content
parentc39033bc1cff578626b6925ed542cfc8f709e15c (diff)
[REF] website: 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>
Diffstat (limited to 'addons/website/static/src/js/content')
-rw-r--r--addons/website/static/src/js/content/lazy_template_call.js2
-rw-r--r--addons/website/static/src/js/content/menu.js2
-rw-r--r--addons/website/static/src/js/content/website_root.js4
3 files changed, 4 insertions, 4 deletions
diff --git a/addons/website/static/src/js/content/lazy_template_call.js b/addons/website/static/src/js/content/lazy_template_call.js
index 80f045cbb0f..f38aab40693 100644
--- a/addons/website/static/src/js/content/lazy_template_call.js
+++ b/addons/website/static/src/js/content/lazy_template_call.js
@@ -37,7 +37,7 @@ publicWidget.registry.LazyTemplateRenderer = publicWidget.Widget.extend({
});
});
- return $.when(def, renderDef);
+ return Promise.all([def, renderDef]);
},
});
});
diff --git a/addons/website/static/src/js/content/menu.js b/addons/website/static/src/js/content/menu.js
index e24ef22a530..913740098b6 100644
--- a/addons/website/static/src/js/content/menu.js
+++ b/addons/website/static/src/js/content/menu.js
@@ -126,7 +126,7 @@ publicWidget.registry.autohideMenu = publicWidget.Widget.extend({
$window.trigger('resize');
});
}
- return $.when.apply($, defs).then(function () {
+ return Promise.all(defs).then(function () {
if (!self.noAutohide) {
dom.initAutoMoreMenu(self.$el, {unfoldable: '.divider, .divider ~ li'});
}
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js
index e1a7be21487..9f16c94b38b 100644
--- a/addons/website/static/src/js/content/website_root.js
+++ b/addons/website/static/src/js/content/website_root.js
@@ -127,12 +127,12 @@ var WebsiteRoot = publicRootData.PublicRoot.extend({
object: $data.data('object'),
},
})
- .done(function (result) {
+ .then(function (result) {
$data.toggleClass("css_unpublished css_published");
$data.find('input').prop("checked", result);
$data.parents("[data-publish]").attr("data-publish", +result ? 'on' : 'off');
})
- .fail(function (err, data) {
+ .guardedCatch(function (err, data) {
return new Dialog(self, {
title: data.data ? data.data.arguments[0] : "",
$content: $('<div/>', {