svnno****@sourc*****
svnno****@sourc*****
2011年 10月 31日 (月) 20:58:52 JST
Revision: 3053 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=3053 Author: dhrname Date: 2011-10-31 20:58:52 +0900 (Mon, 31 Oct 2011) Log Message: ----------- SVGAnimateColorElementインターフェースのinheritを修正 Modified Paths: -------------- branches/08x/088/org/w3c/dom/svg.js Modified: branches/08x/088/org/w3c/dom/svg.js =================================================================== --- branches/08x/088/org/w3c/dom/svg.js 2011-10-31 11:20:31 UTC (rev 3052) +++ branches/08x/088/org/w3c/dom/svg.js 2011-10-31 11:58:52 UTC (rev 3053) @@ -5688,7 +5688,8 @@ var tar = evt.target, attrName = tar.getAttributeNS(null, "attributeName"), ttr = tar.targetElement, - fstyle = tar.ownerDocument.defaultView.getComputedStyle(ttr, ""); + fstyle = tar.ownerDocument.defaultView.getComputedStyle(ttr, ""), + css, n; if (!tar._values[0]) { tar._values[0] = fstyle.getPropertyValue(attrName); } @@ -5697,13 +5698,19 @@ if (tar._values[i] === "currentColor") { to.setRGBColor(fstyle.getPropertyValue("color") || "black"); } else if (tar._values[i] === "inherit") { - to.setRGBColor(fstyle.getPropertyValue(attrName) || "black"); + /*いったん、cssValueTypeプロパティをinheritに指定して、継承元のオブジェクトを取得*/ + css = fstyle.getPropertyCSSValue(attrName); + n = css.cssValueType; + css.cssValueType = /*CSSValue.CSS_INHERIT*/ 0; + to = fstyle.getPropertyCSSValue(attrName); + css.cssValueType = n; } else { to.setRGBColor(tar._values[i]); } tar._valueList[tar._valueList.length] = to; to = void 0; } + tar = ttr = fstyle = css = n = attrName = void 0; }, false); }, false); this.addEventListener("beginEvent", function(evt) {