[MERGE] forward port branch saas-12 up to 7134aff

4 files changed, 9 insertions, 8 deletions

diff --git a/addons/website/static/src/js/website.contentMenu.js b/addons/website/static/src/js/website.contentMenu.js
index 82bbefcf8c2..aa695857746 100644
--- a/addons/website/static/src/js/website.contentMenu.js
+++ b/addons/website/static/src/js/website.contentMenu.js
@@ -186,8 +186,8 @@ var SelectEditMenuDialog = widget.Dialog.extend({
         }, options || {}));
     },
     save: function () {
-        this.trigger("save", parseInt(this.$el.find("select").val() || null));
-        this._super();
+        this.final_data = parseInt(this.$el.find("select").val() || null);
+        this._super.apply(this, arguments);
     }
 });
 
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 046da64ccf7..c765e335f7c 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -175,9 +175,10 @@ odoo.define('website.website', function (require) {
     });
 
     /* ----- PUBLISHING STUFF ---- */
-    $(document).on('click', '.js_publish_management .js_publish_btn', function () {
+    $(document).on('click', '.js_publish_management .js_publish_btn', function (e) {
+        e.preventDefault();
+
         var $data = $(this).parents(".js_publish_management:first");
-        var self=this;
         ajax.jsonRpc($data.data('controller') || '/website/publish', 'call', {'id': +$data.data('id'), 'object': $data.data('object')})
             .then(function (result) {
                 $data.toggleClass("css_unpublished css_published");
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 4b5acc8090a..09e6c00a701 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -343,8 +343,8 @@ var Configurator = Dialog.extend({
     template: 'website.seo_configuration',
     events: {
         'keyup input[name=seo_page_keywords]': 'confirmKeyword',
-        'keyup input[name=seo_page_title]': 'titleChanged',
-        'keyup textarea[name=seo_page_description]': 'descriptionChanged',
+        'blur input[name=seo_page_title]': 'titleChanged',
+        'blur textarea[name=seo_page_description]': 'descriptionChanged',
         'click button[data-action=add]': 'addKeyword',
     },
     canEditTitle: false,
diff --git a/addons/website/static/src/js/website.snippets.gallery.js b/addons/website/static/src/js/website.snippets.gallery.js
index 481ba06e6f3..cde906ca764 100644
--- a/addons/website/static/src/js/website.snippets.gallery.js
+++ b/addons/website/static/src/js/website.snippets.gallery.js
@@ -67,7 +67,7 @@ options.registry.gallery = options.Class.extend({
     },
     bind_change: function () {
         var self = this;
-        return this.$target.find("img").off('saved').on('saved', function (event, img) {
+        return this.$target.find("img").off('save').on('save', function (event, img) {
                 var $parent = $(img).parent();
                 $parent.addClass("saved_active");
                 var index = self.$target.find(".item.saved_active").index();
@@ -228,7 +228,7 @@ options.registry.gallery = options.Class.extend({
         var $container = this.$target.find(".container:first");
         var editor = new widget.MediaDialog(null, {select_images: true}, this.$target.closest('.o_editable'), null).open();
         var index = Math.max(0, _.max(_.map(this.$target.find("img").get(), function (img) { return img.dataset.index | 0; })) + 1);
-        editor.on('saved', this, function (attachments) {
+        editor.on('save', this, function (attachments) {
             for (var i = 0 ; i < attachments.length; i++) {
                 $('<img class="img img-responsive mb8 mt8"/>')
                     .attr("src", attachments[i].src)