pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: inliner don't apply color when background-color

Browse Source
This commit is contained in:
Christophe Matthieu
2016-01-18 17:09:02 +01:00
parent 57fe8147f3
commit 365e298fb1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/transcoder.js
+2 -2
View File
@@ -169,7 +169,7 @@ var class_to_style = function ($editable) {
var css = getMatchedCSSRules(this);
var style = $target.attr("style") || "";
_.each(css, function (v,k) {
if (style.indexOf(k) === -1) {
if (!(new RegExp('(^|;)\s*' + k).test(style))) {
style = k+":"+v+";"+style;
}
});
@@ -187,7 +187,7 @@ var style_to_class = function ($editable) {
var css = getMatchedCSSRules(this);
var style = "";
_.each(css, function (v,k) {
if (style.indexOf(k) === -1) {
if (!(new RegExp('(^|;)\s*' + k).test(style))) {
style = k+":"+v+";"+style;
}
});