summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/menu/edit.js
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/menu/edit.js
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/menu/edit.js')
-rw-r--r--addons/website/static/src/js/menu/edit.js16
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/website/static/src/js/menu/edit.js b/addons/website/static/src/js/menu/edit.js
index a9712be72bb..a08ca136131 100644
--- a/addons/website/static/src/js/menu/edit.js
+++ b/addons/website/static/src/js/menu/edit.js
@@ -53,7 +53,7 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
// If we auto start the editor, do not show a welcome message
if (this._editorAutoStart) {
- return $.when(def, this._startEditMode());
+ return Promise.all([def, this._startEditMode()]);
}
// Check that the page is empty
@@ -85,7 +85,7 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
* welcome message if necessary.
*
* @private
- * @returns {Deferred}
+ * @returns {Promise}
*/
_startEditMode: function () {
var self = this;
@@ -111,13 +111,13 @@ var EditPageMenu = websiteNavbarData.WebsiteNavbarActionWidget.extend({
.find('.oe_structure.oe_empty, [data-oe-type="html"]')
.not('[data-editor-message]')
.attr('data-editor-message', _t('DRAG BUILDING BLOCKS HERE'));
- var def = $.Deferred();
- self.trigger_up('widgets_start_request', {
- editableMode: true,
- onSuccess: def.resolve.bind(def),
- onFailure: def.reject.bind(def),
+ new Promise(function (resolve, reject) {
+ self.trigger_up('widgets_start_request', {
+ editableMode: true,
+ onSuccess: resolve,
+ onFailure: reject,
+ });
});
- return def;
});
},
/**