[FIX] website editor: Issues with link dialog. After changing style one button from the modal, all its right sibling buttons are dis-appeared.; delete content of the range is wrong

1 files changed, 11 insertions, 1 deletions

diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index 1f22e532c23..05f07b382a0 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -357,15 +357,24 @@ define(['summernote/summernote'], function () {
     };
 
     eventHandler.dialog.showLinkDialog = function ($editable, $dialog, linkInfo) {
+        $editable.data('range').select();
+        $editable.data('NoteHistory').recordUndo();
+        
         var editor = new website.editor.LinkDialog($editable, linkInfo);
         editor.appendTo(document.body);
 
         var def = new $.Deferred();
         editor.on("save", this, function (linkInfo) {
+            linkInfo.range.select();
+            $editable.data('range', linkInfo.range);
             def.resolve(linkInfo);
+            $editable.data('NoteHistory').popUndo();
             $('.note-popover .note-link-popover').show();
         });
-        editor.on("cancel", this, function () { def.reject(); });
+        editor.on("cancel", this, function () {
+            def.reject();
+            $editable.data('NoteHistory').popUndo();
+        });
         return def;
     };
     eventHandler.dialog.showImageDialog = function ($editable) {
@@ -806,6 +815,7 @@ define(['summernote/summernote'], function () {
         };
 
         this.popUndo = function () {
+            pos--;
             aUndo.pop();
         };