From ce3b09dff26396547e06e21e50ffe869dba64831 Mon Sep 17 00:00:00 2001
From: xO-Tx <mou@odoo.com>
Date: Wed, 8 Sep 2021 15:38:50 +0000
Subject: [PATCH] [FIX] web_editor: fix empty save on dialogs

I- mediaDialog/linkDialog:

1- Website editor > Add image/link using "/" commands.
2- The mediaDliaog/linkDialog will be shown to select item.
3- Click on "Add/Save" without selecting any image/setting
   any link.
4- traceback.

II- mediaDialog (Video):

The same flow for videos will add an empty <iframe> (with
no src specified) to the DOM.

The goal of this commit is to prevent this behaviour
by adding a test on values passed to the 'save' event
listeners.

task-2628964

closes odoo/odoo#78967

X-original-commit: 1e5c7d6f3525823101215cb18b44d2b936c9c521
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/web_editor/static/src/js/wysiwyg/widgets/media.js | 9 +++++----
 addons/web_editor/static/src/js/wysiwyg/wysiwyg.js       | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
index aa4467a5ee4..0e700e18ec6 100644
--- a/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
+++ b/addons/web_editor/static/src/js/wysiwyg/widgets/media.js
@@ -1276,15 +1276,16 @@ var VideoWidget = MediaWidget.extend({
      */
     save: function () {
         this._updateVideo();
+        const videoSrc = this.$content.attr('src');
         if (this.isForBgVideo) {
-            return Promise.resolve({bgVideoSrc: this.$content.attr('src')});
+            return Promise.resolve({bgVideoSrc: videoSrc});
         }
-        if (this.$('.o_video_dialog_iframe').is('iframe')) {
+        if (this.$('.o_video_dialog_iframe').is('iframe') && videoSrc) {
             this.$media = $(
-                '<div class="media_iframe_video" data-oe-expression="' + this.$content.attr('src') + '">' +
+                '<div class="media_iframe_video" data-oe-expression="' + videoSrc + '">' +
                     '<div class="css_editable_mode_display">&nbsp;</div>' +
                     '<div class="media_iframe_video_size" contenteditable="false">&nbsp;</div>' +
-                    '<iframe src="' + this.$content.attr('src') + '" frameborder="0" contenteditable="false" allowfullscreen="allowfullscreen"></iframe>' +
+                    '<iframe src="' + videoSrc + '" frameborder="0" contenteditable="false" allowfullscreen="allowfullscreen"></iframe>' +
                 '</div>'
             );
             this.media = this.$media[0];
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 387f2f2bfa9..4d3b3681cfe 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -849,6 +849,9 @@ const Wysiwyg = Widget.extend({
             const restoreSelection = preserveCursor(this.odooEditor.document);
             linkDialog.open();
             linkDialog.on('save', this, data => {
+                if (!data) {
+                    return;
+                }
                 const linkWidget = linkDialog.linkWidget;
                 getDeepRange(this.$editable[0], {range: data.range, select: true});
                 if (!linkWidget.$link.length) {
@@ -918,6 +921,9 @@ const Wysiwyg = Widget.extend({
         mediaDialog.open();
 
         mediaDialog.on('save', this, function (element) {
+            if (!element) {
+                return;
+            }
             // restore saved html classes
             if (params.htmlClass) {
                 element.className += " " + params.htmlClass;