summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-09-28 14:46:29 +0200
committerChristophe Simonis <chs@odoo.com>2016-09-28 14:46:29 +0200
commit2c6d32ca7de39a782468f63be3e952089a71199e (patch)
treeaac137992a408f87e3da091946d55d59874dfbc3 /addons/website/static/src
parentf757af38e2257a8a8fecf474fadf01b8b3613e32 (diff)
parent34186fdfc0ff7a35562bc7612ee763af87716a51 (diff)
[MERGE] forward port branch saas-11 up to 34186fd
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.js5
-rw-r--r--addons/website/static/src/js/website.seo.js4
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 00d2af0367c..70fc06ba5e9 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -176,9 +176,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 528c25afa56..9e1c7ead1f5 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,