[MERGE] forward port branch 12.0 up to 6a0675d36d

2019-01-14 10:34:50 +01:00
parent 976429c8c6 6a0675d36d
commit 3cbc9dd6c0
99 changed files with 1161 additions and 223 deletions
@@ -773,6 +773,7 @@ var IconWidget = MediaWidget.extend({
        this.$('div.font-icons-icons').html(
            QWeb.render('web_editor.dialog.font-icons.icons', {iconsParser: iconsParser})
        );
+        return $.when();
    },

    //--------------------------------------------------------------------------
@@ -1299,6 +1300,7 @@ var MediaDialog = Dialog.extend({
    /**
     * @private
     */
+        ev.preventDefault();
    _onSaveRequest: function (ev) {
        ev.stopPropagation();
        this.save();