diff options
Diffstat (limited to 'addons/website/static/src/js/content')
| -rw-r--r-- | addons/website/static/src/js/content/lazy_template_call.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/content/menu.js | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/content/website_root.js | 4 |
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/>', { |
