From 4d5c3b9fc1c549a97030725b35a3bc4916f3c97c Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur <nle@odoo.com> Date: Wed, 6 Nov 2019 14:14:23 +0000 Subject: [PATCH] [FIX] website: link dialog over image adaptation Adapt website for 13.0 9996d04fd2 change of LinkDialog constructor arguments (to get back to same arguments as in 12.0). opw-2086444 closes #39888 Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com> --- .../web_editor/static/src/js/wysiwyg/widgets/link_dialog.js | 1 + addons/website/static/src/js/menu/content.js | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js b/addons/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js index 768781410f65..a03167eeaa5a 100644 --- a/addons/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js +++ b/addons/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js @@ -45,6 +45,7 @@ var LinkDialog = Dialog.extend({ this.data = linkInfo || {}; this.data.className = ""; + this.data.iniClassName = ""; var r = this.data.range; this.needLabel = !r || (r.sc === r.ec && r.so === r.eo); diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js index 6aeeb9d50853..3ff685d6565f 100644 --- a/addons/website/static/src/js/menu/content.js +++ b/addons/website/static/src/js/menu/content.js @@ -368,10 +368,10 @@ var MenuEntryDialog = weWidgets.LinkDialog.extend({ /** * @constructor */ - init: function (parent, options, data) { + init: function (parent, options, editable, data) { this._super(parent, _.extend({ title: _t("Add a menu item"), - }, options || {}), _.extend({ + }, options || {}), editable, _.extend({ needLabel: true, text: data.name || '', isNewWindow: data.new_window, @@ -646,7 +646,7 @@ var EditMenuDialog = weWidgets.Dialog.extend({ var menuID = $menu.data('menu-id'); var menu = this.flat[menuID]; if (menu) { - var dialog = new MenuEntryDialog(this, {}, _.extend({ + var dialog = new MenuEntryDialog(this, {}, null, _.extend({ menuType: menu.fields['is_mega_menu'] ? 'mega' : undefined, }, menu.fields)); dialog.on('save', this, link => { -- GitLab