svnno****@sourc*****
svnno****@sourc*****
2010年 12月 16日 (木) 19:58:35 JST
Revision: 2222 http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2222 Author: dhrname Date: 2010-12-16 19:58:32 +0900 (Thu, 16 Dec 2010) Log Message: ----------- 1, SVGFontElementの修正 2, 関数NAIBU._noie_createFontのgetPropertyValueメソッドに変更したことによる修正 Modified Paths: -------------- branches/06x/066/org/w3c/dom/svg.js Modified: branches/06x/066/org/w3c/dom/svg.js =================================================================== --- branches/06x/066/org/w3c/dom/svg.js 2010-12-14 14:26:27 UTC (rev 2221) +++ branches/06x/066/org/w3c/dom/svg.js 2010-12-16 10:58:32 UTC (rev 2222) @@ -5188,7 +5188,7 @@ this.addEventListener("DOMNodeInserted", function(evt){ var tar = evt.target; if (evt.eventPhase === Event.BUBBLING_PHASE) { - if (tar.localName === "font-face-uri" && tar.hasAttributeNS(null, "xlink:href")) { + if (tar.localName === "font-face-uri" && tar.hasAttributeNS("http://www.w3.org/1999/xlink", "xlink:href")) { evt.currentTarget.addEventListener("SVGLoad", function(evt){ var tar = evt.target, svgns = "http://www.w3.org/2000/svg"; var familyName = evt.currentTarget.getElementsByTagNameNS(svgns, "font-face").item(0).getAttributeNS(null, "font-family"); @@ -5443,7 +5443,7 @@ var node = ti.firstChild, data, glyphs = font.getElementsByTagNameNS(svgns, "glyph"); var em = parseFloat(font.getElementsByTagNameNS(svgns, "font-face").item(0).getAttribute("units-per-em") || 0); var advX = parseFloat( (font.getAttributeNS(null, horizOrVert) || em) ); //字幅の設定 - var dx = parseFloat(ti.getAttributeNS(null, "x") || 0), fontSize = parseFloat(style.fontSize), dy = parseFloat(ti.getAttributeNS(null, "y") || 0), fe = fontSize / em; + var dx = parseFloat(ti.getAttributeNS(null, "x") || 0), fontSize = parseFloat(style.getPropertyValue("font-size")), dy = parseFloat(ti.getAttributeNS(null, "y") || 0), fe = fontSize / em; var ds = false, npdlist = ["fill", "fill-opacity", "stroke", @@ -5527,7 +5527,7 @@ } node = node.nextSibling; } - ti.style.opacity = "0"; + ti.style.setProperty("opacity", "0", null); } data = isTategaki = horizOrVert = em = advX = dx = dy = fontSize = style = svgns = null; };