summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/src/js/widgets
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-06-27 11:18:06 +0200
committerqsm-odoo <qsm@odoo.com>2018-06-27 12:42:44 +0200
commit22c9d60ad36ddbf750f45ae883fb378b23b668eb (patch)
tree56d861337761bb470e848551581a59361ad6dfbf /addons/web_editor/static/src/js/widgets
parent12ddec3a7674c71028080f97adf8c7fec3176b65 (diff)
[FIX] web_editor: properly save media dialog without any image
Commit https://github.com/odoo/odoo/commit/50418c481182cb414792da32f2a0529503e59f9c was correctly forward-ported up to 11.0. This commit fixes the forward-port from saas-11.2.
Diffstat (limited to 'addons/web_editor/static/src/js/widgets')
-rw-r--r--addons/web_editor/static/src/js/widgets/widgets.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/addons/web_editor/static/src/js/widgets/widgets.js b/addons/web_editor/static/src/js/widgets/widgets.js
index 7aa300b5bbb..1b0abcecb14 100644
--- a/addons/web_editor/static/src/js/widgets/widgets.js
+++ b/addons/web_editor/static/src/js/widgets/widgets.js
@@ -291,6 +291,10 @@ var ImageWidget = MediaWidget.extend({
}
var img = this.images[0];
+ if (!img) {
+ return this.media;
+ }
+
var def = $.when();
if (!img.access_token) {
def = this._rpc({
@@ -1214,7 +1218,7 @@ var MediaDialog = Dialog.extend({
}
return $.when(this.active.save()).then(function (media) {
- if (!self.media) {
+ if (!self.media && media) {
self.range.insertNode(media, true);
}
self.media = media;
@@ -1226,7 +1230,7 @@ var MediaDialog = Dialog.extend({
// Update editor bar after image edition (in case the image change to icon or other)
_.defer(function () {
- if (!self.media.parentNode) {
+ if (!self.media || !self.media.parentNode) {
return;
}
range.createFromNode(self.media).select();