diff options
| author | Olivier Dony <odo@openerp.com> | 2014-10-14 16:27:43 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-10-14 16:27:43 +0200 |
| commit | 8ec725e5e56ad700e85fa3cd29a0b2f0c38c7ae7 (patch) | |
| tree | 02d610c1f246321915b12b02b7ade8db42abb5bd | |
| parent | b9fdb93bece59c1d3d8cf17495e9f9f0d90e6b23 (diff) | |
[FIX] website: editor: preserve label and color for link buttons targeting a page
When selecting a page target rather than a static
URL the style and label information were ignored/lost.
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 6d151dc1008..2764e2138ee 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1011,17 +1011,17 @@ var classes = (style && style.length ? "btn " : "") + style + " " + size; if ($e.hasClass('email-address') && $e.val().indexOf("@") !== -1) { - def.resolve('mailto:' + val, false, label); + def.resolve('mailto:' + val, false, label, classes); } else if ($e.val() && $e.val().length && $e.hasClass('page')) { var data = $e.select2('data'); if (!data.create) { - def.resolve(data.id, false, data.text); + def.resolve(data.id, false, label || data.text, classes); } else { // Create the page, get the URL back $.get(_.str.sprintf( '/website/add/%s?noredirect=1', encodeURI(data.id))) .then(function (response) { - def.resolve(response, false, data.id); + def.resolve(response, false, data.id, classes); }); } } else { |