diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-24 17:57:29 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-24 17:57:29 +0100 |
| commit | 70b770d62e53e55075daef20674a7efaaf85655c (patch) | |
| tree | 2e00377304a89fe5c00e3e8da50323bf45a8afa7 /addons/web_editor/static/src | |
| parent | fa02b798377da3a1c14fddbacfc81b626d862283 (diff) | |
| parent | 8376f538b568c7a679db414bbb2379c66a78cff0 (diff) | |
[MERGE] forward port branch 9.0 up to 8376f538b56
Diffstat (limited to 'addons/web_editor/static/src')
| -rw-r--r-- | addons/web_editor/static/src/js/transcoder.js | 2 | ||||
| -rw-r--r-- | addons/web_editor/static/src/js/widgets.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/web_editor/static/src/js/transcoder.js b/addons/web_editor/static/src/js/transcoder.js index e91c365a011..386363af3a3 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -132,7 +132,7 @@ var font_to_img = function ($editable) { var icon, content; _.find(widget.fontIcons, function (font) { return _.find(widget.getCssSelectors(font.parser), function (css) { - if ($font.is(css[0].replace(/::?before$/, ''))) { + if ($font.is(css[0].replace(/::?before/g, ''))) { icon = css[2].split("-").shift(); content = css[1].match(/content:\s*['"]?(.)['"]?/)[1]; return true; diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index 81b8bca7626..71284ae65be 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -573,6 +573,7 @@ var getCssSelectors = function (filter) { if (!data) { data = [match[1], rules[r].cssText.replace(/(^.*\{\s*)|(\s*\}\s*$)/g, ''), clean, [clean]]; } else { + data[0] += (", " + match[1]); data[3].push(clean); } } |