From 923ae6415c5f74cbe690dc69aeaa4ee7792d2e44 Mon Sep 17 00:00:00 2001 From: qsm-odoo Date: Wed, 30 Dec 2020 09:52:43 +0000 Subject: [PATCH] [FIX] web_editor: fix post-JW revert button edition Failed to remove a line at conflict resolution during JW revert at [1]. [1]: https://github.com/odoo/odoo/commit/e5572c317a7775a58675ed73efc89b5c9f6c0c39 task-2424849 closes odoo/odoo#63908 X-original-commit: 15fd0b765d38199961d4210f362770216af23a42 Signed-off-by: Quentin Smetz (qsm) --- addons/web_editor/static/src/js/wysiwyg/widgets/link_dialog.js | 2 -- 1 file changed, 2 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 72def902117..1302fdc7375 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 @@ -144,8 +144,6 @@ var LinkDialog = Dialog.extend({ this.data.text = this.data.text.replace(/[ \t\r\n]+/g, ' '); - this.__editorEditable = this.props.__editorEditable; - var allBtnClassSuffixes = /(^|\s+)btn(-[a-z0-9_-]*)?/gi; var allBtnShapes = /\s*(rounded-circle|flat)\s*/gi; this.data.className = this.data.iniClassName