evert/svgcanvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug with globalAlpha

Browse Source
This commit is contained in:
fuzhen 2016-01-06 23:27:49 +08:00
parent 9dc92b79aa
commit efcdc56ccd
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
canvas2svg.js
View File

@ -141,10 +141,16 @@
apply : "stroke" apply : "stroke"
}, },
"globalAlpha": { "globalAlpha": {
svgAttr : "opacity", svgAttr : "stroke-opacity",
canvas : 1, canvas : 1,
svg : 1, svg : 1,
apply : "fill stroke" apply : "stroke"
},
"globalAlpha": {
svgAttr : "fill-opacity",
canvas : 1,
svg : 1,
apply : "fill"
}, },
"font":{ "font":{
//font converts to multiple svg attributes, there is custom logic for this //font converts to multiple svg attributes, there is custom logic for this
@ -368,10 +374,24 @@
regex = /rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?\.?\d*)\s*\)/gi; regex = /rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d?\.?\d*)\s*\)/gi;
matches = regex.exec(value); matches = regex.exec(value);
this.__currentElement.setAttribute(style.svgAttr, format("rgb({r},{g},{b})", {r:matches[1], g:matches[2], b:matches[3]})); this.__currentElement.setAttribute(style.svgAttr, format("rgb({r},{g},{b})", {r:matches[1], g:matches[2], b:matches[3]}));
this.__currentElement.setAttribute(style.svgAttr+"-opacity", matches[4]); //should take globalAlpha here
var opacity = matches[4];
var globalAlpha = this.globalAlpha;
if (globalAlpha != null) {
opacity *= globalAlpha;
}
this.__currentElement.setAttribute(style.svgAttr+"-opacity", opacity);
} else { } else {
if (keys[i] === 'globalAlpha') {
if (this.__currentElement.getAttribute(style.svgAttr)) {
//fill-opacity or stroke-opacity has already been set by stroke or fill.
continue;
}
}
//otherwise only update attribute if right type, and not svg default //otherwise only update attribute if right type, and not svg default
this.__currentElement.setAttribute(style.svgAttr, value); this.__currentElement.setAttribute(style.svgAttr, value);
} }
} }
} }