diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-03-28 17:27:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-03-28 17:27:19 +0200 |
| commit | 2f68e9e93a11f37241c1be2835e74ff8be95db1d (patch) | |
| tree | 74dd3d3ae1bbca5b87f2b5715c2e4a3d1baf457b /addons/web_editor/static/src/js | |
| parent | 55895c7de10592751058b02c01eed39f2d3cffe9 (diff) | |
| parent | 72fa3e8bdae7b339c75294de51ce261b7a9da173 (diff) | |
[MERGE] forward port branch 10.0 up to 72fa3e8bdae
Diffstat (limited to 'addons/web_editor/static/src/js')
| -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 fa7b4023377..05068972532 100644 --- a/addons/web_editor/static/src/js/transcoder.js +++ b/addons/web_editor/static/src/js/transcoder.js @@ -131,7 +131,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 0b634b45b36..44b6b9502d1 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -564,6 +564,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); } } |