svnno****@sourc*****
svnno****@sourc*****
2011年 8月 9日 (火) 21:27:05 JST
ForkRevision: 2858
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2858
Author: dhrname
Date: 2011-08-09 21:27:05 +0900 (Tue, 09 Aug 2011)
Log Message:
-----------
0.82beta修正
Modified Paths:
--------------
trunk/sie.js
Property Changed:
----------------
trunk/sie.js
Modified: trunk/sie.js
===================================================================
--- trunk/sie.js 2011-08-09 12:23:16 UTC (rev 2857)
+++ trunk/sie.js 2011-08-09 12:27:05 UTC (rev 2858)
@@ -3983,11 +3983,16 @@
/*responseXMLを使うと、時々、空のデータを返すことがあるため（原因は不明）、
*ここでは、responseTextを用いる
*/
- var ifr = this._tar.previousSibling;
- ifr.contentWindow.screen.updateInterval = 999;
- var _doc = ifr.contentWindow.document;
- _doc.write("");
- _doc.close(); // これがないと document.body は null になる
+ var ifr = this._tar.previousSibling,
+ _doc;
+ if (ifr.contentWindow) {
+ ifr.contentWindow.screen.updateInterval = 999;
+ _doc = ifr.contentWindow.document;
+ _doc.write("");
+ _doc.close(); // これがないと document.body は null になる
+ } else { //インラインSVGの場合
+ _doc = document;
+ }
if (("namespaces" in _doc) && !_doc.namespaces["v"]) {
_doc.namespaces.add("v","urn:schemas-microsoft-com:vml");
_doc.namespaces.add("o","urn:schemas-microsoft-com:office:office");
@@ -4016,7 +4021,10 @@
oba = _doc.createElement("div"); //obaはradialGradient要素で使う
oba.setAttribute("id","_NAIBU_outline");
_doc.body.appendChild(oba);
- _doc.body.style.backgroundColor = objei.parentNode.currentStyle.backgroundColor;
+ sp.style.margin = "-2px,-0px,0px,-2px"
+ if (ifr.contentWindow) {
+ _doc.body.style.backgroundColor = objei.parentNode.currentStyle.backgroundColor;
+ }
s._document_ = _doc; //_document_プロパティはradialGradient要素やNAIBU._setPaintなどで使う
ndoc.async = false;
/*下記のプロパティについては、Microsoftのサイトを参照
@@ -4080,7 +4088,11 @@
dcp.style.height = tview.height+ "px";
dcp.coordsize = tview.width+ " " +tview.height;
sp.appendChild(dcp);
- _doc.body.appendChild(sp);
+ if (ifr.contentWindow) {
+ _doc.body.appendChild(sp);
+ } else {
+ this._tar.parentNode.insertBefore(sp, this._tar);
+ }
dcp.appendChild(sdt);
while (fi) { //子ノードを検索して、子供がいれば、importNodeメソッドを再帰的に実行する
n = s.importNode(fi, true);
@@ -4166,7 +4178,7 @@
/*IEのメモリリーク対策として、空関数を入力*/
this.xmlhttp.onreadystatechange = NAIBU.emptyFunction;
if (this._next) {
- ifr.contentWindow.screen.updateInterval = 0;
+ ifr.contentWindow && (ifr.contentWindow.screen.updateInterval = 0);
ifr = s = null;
this._next._init();
} else {
@@ -6496,7 +6508,7 @@
sty.top = p.y + "px";
sty.width = "0px";
sty.height = "0px";
- sty.marginTop = tar._isYokogaki ? -n-10+ "px" : "-10px";
+ sty.marginTop = tar._isYokogaki ? -n-5+ "px" : "-5px";
sty.lineHeight = n+10+ "px";
ttp.appendChild(ti._tars[ij]);
sty = p = null;
@@ -6525,26 +6537,27 @@
var color = style.getPropertyValue("fill"),
cursor = style.getPropertyCSSValue("cursor"),
vis = style.getPropertyCSSValue("visibility"),
- disp = style.getPropertyCSSValue("display");
+ disp = style.getPropertyCSSValue("display"),
+ tts = tar._tar.style;
if (color === "none"){
- tar._tar.style.color = "transparent";
+ tts.color = "transparent";
} else if (color.indexOf("url") === -1) {
- tar._tar.style.color = color;
+ tts.color = color;
} else {
- tar._tar.style.color = "black";
+ tts.color = "black";
}
if (cursor && !cursor._isDefault) { //初期値でないならば
var tc = cursor.cssText;
- el.style.cursor = tc.substring(tc.indexOf(":")+1, tc.length);
+ tts.cursor = tc.substring(tc.indexOf(":")+1, tc.length);
tc = null;
}
if (vis && !vis._isDefault) {
- el.style.visibility = vis.cssText.substring(vis.cssText.indexOf(":")+1, vis.cssText.length);
+ tts.visibility = vis.cssText.substring(vis.cssText.indexOf(":")+1, vis.cssText.length);
}
if (disp && !disp._isDefault && (disp.cssText.indexOf("none") > -1)) {
- el.style.display = "none";
+ tts.display = "none";
} else if (disp && !disp._isDefault) {
- el.style.display = "block";
+ tts.display = "block";
}
var isRect = true;
if (ttp.lastChild) {
Property changes on: trunk/sie.js
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/04x/040/sie.js:812-829
/branches/04x/041/sie.js:891-923
/branches/04x/042/sie.js:927-967
/branches/04x/043/sie.js:969-1013
/branches/04x/044/sie.js:1015-1067
/branches/04x/045/sie.js:1069-1078
/branches/04x/046/sie.js:1080-1129
/branches/04x/047/sie.js:1131-1164
/branches/04x/048/sie.js:1166-1180
/branches/04x/sie.js:830-1181
/branches/05x/050/sie.js:1183-1201
/branches/05x/051/sie.js:1207-1323
/branches/05x/052/sie.js:1325-1352
/branches/05x/053/sie.js:1354-1400
/branches/05x/054/sie.js:1403-1422
/branches/05x/055/sie.js:1424-1454
/branches/05x/056/sie.js:1456-1491
/branches/05x/057/sie.js:1496-1523
/branches/05x/058/sie.js:1526-1590
/branches/05x/sie.js:1183-1594
/branches/06x/060/sie.js:1603-1850
/branches/06x/sie.js:1599-2355
/branches/07x/sie.js:2357-2748
/branches/08x/sie.js:2750-2847
+ /branches/04x/040/sie.js:812-829
/branches/04x/041/sie.js:891-923
/branches/04x/042/sie.js:927-967
/branches/04x/043/sie.js:969-1013
/branches/04x/044/sie.js:1015-1067
/branches/04x/045/sie.js:1069-1078
/branches/04x/046/sie.js:1080-1129
/branches/04x/047/sie.js:1131-1164
/branches/04x/048/sie.js:1166-1180
/branches/04x/sie.js:830-1181
/branches/05x/050/sie.js:1183-1201
/branches/05x/051/sie.js:1207-1323
/branches/05x/052/sie.js:1325-1352
/branches/05x/053/sie.js:1354-1400
/branches/05x/054/sie.js:1403-1422
/branches/05x/055/sie.js:1424-1454
/branches/05x/056/sie.js:1456-1491
/branches/05x/057/sie.js:1496-1523
/branches/05x/058/sie.js:1526-1590
/branches/05x/sie.js:1183-1594
/branches/06x/060/sie.js:1603-1850
/branches/06x/sie.js:1599-2355
/branches/07x/sie.js:2357-2748
/branches/08x/sie.js:2750-2857