svnno****@sourc*****
svnno****@sourc*****
2009年 11月 1日 (日) 20:50:37 JST
ForkRevision: 1385
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1385
Author: dhrname
Date: 2009-11-01 20:50:37 +0900 (Sun, 01 Nov 2009)
Log Message:
-----------
Modified Paths:
--------------
branches/05x/053/sie.js
Modified: branches/05x/053/sie.js
===================================================================
--- branches/05x/053/sie.js 2009-11-01 11:16:22 UTC (rev 1384)
+++ branches/05x/053/sie.js 2009-11-01 11:50:37 UTC (rev 1385)
@@ -1853,9 +1853,9 @@
var doc = new ActiveXObject("MSXML2.DomDocument");
str = data.content.replace(/!DOCTYPE/,"!--").replace(/(dtd">|\]>)/,"-->");
doc.loadXML(str);
- var font = doc.getElementById(data.obj[0].id);
+ var font = doc.getElementsByTagNameNS(NAIBU.svgNameSpace, "font").item(0);
var familyName = font.getElementsByTagNameNS(NAIBU.svgNameSpace, "font-face").item(0).getAttribute("font-family");
- if (familyName) {
+ if (familyName && font.getAttribute("id") === data.obj[0].id) {
var textElements = document.getElementByTagName("div");
for (var i=0,tli=textElements.length;i<tli;++i) {
var ti = textElements[i], ts = ti.style, tsff = (!!ts.fontFamily) ? ts.fontFamily : "serif";
@@ -1913,9 +1913,9 @@
function _noie_font(data) {
if (data.success) {
var doc = (new DOMParser()).parseFromString(data.content);
- var font = doc.getElementById(data.obj[0].id);
+ var font = doc.getElementsByTagNameNS(NAIBU.svgNameSpace, "font").item(0);
var familyName = font.getElementsByTagNameNS(NAIBU.svgNameSpace, "font-face").item(0).getAttributeNS(null, "font-family");
- if (familyName) {
+ if (familyName && font.getAttributeNS(null, "id") === data.obj[0].id) {
var textElements = document.getElementByTagNameNS(NAIBU.svgNameSpace, "text");
for (var i=0,tli=textElements.length;i<tli;++i) {
var ti = textElements[i];