OSDN -- Develop and Download Open Source Software

[Sie-announce] SIEコード [2844] 0. 82モジュール統合

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 8月 6日 (土) 19:16:59 JST 

Revision: 2844
          http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2844
Author:   dhrname
Date:     2011-08-06 19:16:59 +0900 (Sat, 06 Aug 2011)

Log Message:
-----------
0.82モジュール統合

Modified Paths:
--------------
    branches/08x/org/w3c/dom/svg.js

Property Changed:
----------------
    branches/08x/org/
    branches/08x/org/w3c/
    branches/08x/org/w3c/core.js
    branches/08x/org/w3c/dom/css.js
    branches/08x/org/w3c/dom/events.js
    branches/08x/org/w3c/dom/svg.js


Property changes on: branches/08x/org
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
/branches/07x/070/org:2363-2383
/branches/07x/071/org:2385-2433
/branches/07x/072/org:2435-2474
/branches/07x/073/org:2476-2509
/branches/07x/074/org:2511-2556
/branches/07x/075/org:2558-2597
/branches/07x/076/org:2600-2631,2642
/branches/07x/077/org:2635-2677
/branches/07x/078/org:2679-2726
/branches/07x/079/org:2728-2745
/branches/07x/org:2356-2753
/branches/07x/org/org:2643
/branches/08x/080/org:2758-2785
/branches/08x/081/org:2787-2814
   + /branches/06x/061/org:1864-2067
/branches/06x/062/org:2071-2106
/branches/06x/063/org:2110-2146
/branches/06x/064/org:2149-2177
/branches/06x/065/org:2179-2209
/branches/06x/066/org:2211-2236
/branches/06x/067/org:2257-2282
/branches/06x/068/org:2284-2314
/branches/06x/069/org:2317-2352
/branches/06x/org:1861-2353
/branches/07x/070/org:2363-2383
/branches/07x/071/org:2385-2433
/branches/07x/072/org:2435-2474
/branches/07x/073/org:2476-2509
/branches/07x/074/org:2511-2556
/branches/07x/075/org:2558-2597
/branches/07x/076/org:2600-2631,2642
/branches/07x/077/org:2635-2677
/branches/07x/078/org:2679-2726
/branches/07x/079/org:2728-2745
/branches/07x/org:2356-2753
/branches/07x/org/org:2643
/branches/08x/080/org:2758-2785
/branches/08x/081/org:2787-2814
/branches/08x/082/org:2817-2843


Property changes on: branches/08x/org/w3c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/07x/070/org/w3c:2363-2383
/branches/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631,2642
/branches/07x/077/org/w3c:2635-2677
/branches/07x/078/org/w3c:2679-2726
/branches/07x/079/org/w3c:2728-2745
/branches/07x/org/org/w3c:2643
/branches/07x/org/w3c:2356-2753
/branches/08x/080/org/w3c:2758-2785
/branches/08x/081/org/w3c:2787-2814
/branches/ufltima:1621-1788
   + /branches/06x/061/org/w3c:1864-2067
/branches/06x/062/org/w3c:2071-2106
/branches/06x/063/org/w3c:2110-2146
/branches/06x/064/org/w3c:2149-2177
/branches/06x/065/org/w3c:2179-2209
/branches/06x/066/org/w3c:2211-2236
/branches/06x/067/org/w3c:2257-2282
/branches/06x/068/org/w3c:2284-2314
/branches/06x/069/org/w3c:2317-2352
/branches/06x/org/w3c:1861-2353
/branches/07x/070/org/w3c:2363-2383
/branches/07x/071/org/w3c:2385-2433
/branches/07x/072/org/w3c:2435-2474
/branches/07x/073/org/w3c:2476-2509
/branches/07x/074/org/w3c:2511-2556
/branches/07x/075/org/w3c:2558-2597
/branches/07x/076/org/w3c:2600-2631,2642
/branches/07x/077/org/w3c:2635-2677
/branches/07x/078/org/w3c:2679-2726
/branches/07x/079/org/w3c:2728-2745
/branches/07x/org/org/w3c:2643
/branches/07x/org/w3c:2356-2753
/branches/08x/080/org/w3c:2758-2785
/branches/08x/081/org/w3c:2787-2814
/branches/08x/082/org/w3c:2817-2843
/branches/ufltima:1621-1788


Property changes on: branches/08x/org/w3c/core.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/07x/070/org/w3c/core.js:2363-2383
/branches/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631,2642
/branches/07x/077/org/w3c/core.js:2635-2677
/branches/07x/078/org/w3c/core.js:2679-2726
/branches/07x/079/org/w3c/core.js:2728-2745
/branches/07x/org/org/w3c/core.js:2643
/branches/07x/org/w3c/core.js:2356-2753
/branches/08x/080/org/w3c/core.js:2758-2785
/branches/08x/081/org/w3c/core.js:2787-2814
/branches/ufltima/core.js:1621-1854
   + /branches/06x/061/org/w3c/core.js:1864-2067
/branches/06x/062/org/w3c/core.js:2071-2106
/branches/06x/063/org/w3c/core.js:2110-2146
/branches/06x/064/org/w3c/core.js:2149-2177
/branches/06x/065/org/w3c/core.js:2179-2209
/branches/06x/066/org/w3c/core.js:2211-2244
/branches/06x/067/org/w3c/core.js:2257-2282
/branches/06x/068/org/w3c/core.js:2284-2314
/branches/06x/069/org/w3c/core.js:2317-2352
/branches/06x/org/w3c/core.js:1861-2353
/branches/07x/070/org/w3c/core.js:2363-2383
/branches/07x/071/org/w3c/core.js:2385-2433
/branches/07x/072/org/w3c/core.js:2435-2474
/branches/07x/073/org/w3c/core.js:2476-2509
/branches/07x/074/org/w3c/core.js:2511-2556
/branches/07x/075/org/w3c/core.js:2558-2597
/branches/07x/076/org/w3c/core.js:2600-2631,2642
/branches/07x/077/org/w3c/core.js:2635-2677
/branches/07x/078/org/w3c/core.js:2679-2726
/branches/07x/079/org/w3c/core.js:2728-2745
/branches/07x/org/org/w3c/core.js:2643
/branches/07x/org/w3c/core.js:2356-2753
/branches/08x/080/org/w3c/core.js:2758-2785
/branches/08x/081/org/w3c/core.js:2787-2814
/branches/08x/082/org/w3c/core.js:2817-2843
/branches/ufltima/core.js:1621-1854


Property changes on: branches/08x/org/w3c/dom/css.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/07x/070/org/w3c/dom/css.js:2363-2383
/branches/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/css.js:2635-2677
/branches/07x/078/org/w3c/dom/css.js:2679-2726
/branches/07x/079/org/w3c/dom/css.js:2728-2745
/branches/07x/org/org/w3c/dom/css.js:2643
/branches/07x/org/w3c/dom/css.js:2356-2753
/branches/08x/080/org/w3c/dom/css.js:2758-2785
/branches/08x/081/org/w3c/dom/css.js:2787-2814
/branches/ufltima/dom/css.js:1621-1855
   + /branches/06x/061/org/w3c/dom/css.js:1864-2067
/branches/06x/062/org/w3c/dom/css.js:2071-2106
/branches/06x/063/org/w3c/dom/css.js:2110-2146
/branches/06x/064/org/w3c/dom/css.js:2149-2177
/branches/06x/065/org/w3c/dom/css.js:2179-2209
/branches/06x/066/org/w3c/dom/css.js:2211-2236
/branches/06x/067/org/w3c/dom/css.js:2257-2282
/branches/06x/068/org/w3c/dom/css.js:2284-2314
/branches/06x/069/org/w3c/dom/css.js:2317-2352
/branches/06x/org/w3c/dom/css.js:1861-2353
/branches/07x/070/org/w3c/dom/css.js:2363-2383
/branches/07x/071/org/w3c/dom/css.js:2385-2433
/branches/07x/072/org/w3c/dom/css.js:2435-2474
/branches/07x/073/org/w3c/dom/css.js:2476-2509
/branches/07x/074/org/w3c/dom/css.js:2511-2556
/branches/07x/075/org/w3c/dom/css.js:2558-2597
/branches/07x/076/org/w3c/dom/css.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/css.js:2635-2677
/branches/07x/078/org/w3c/dom/css.js:2679-2726
/branches/07x/079/org/w3c/dom/css.js:2728-2745
/branches/07x/org/org/w3c/dom/css.js:2643
/branches/07x/org/w3c/dom/css.js:2356-2753
/branches/08x/080/org/w3c/dom/css.js:2758-2785
/branches/08x/081/org/w3c/dom/css.js:2787-2814
/branches/08x/082/org/w3c/dom/css.js:2817-2843
/branches/ufltima/dom/css.js:1621-1855


Property changes on: branches/08x/org/w3c/dom/events.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/07x/070/org/w3c/dom/events.js:2363-2383
/branches/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/events.js:2635-2677
/branches/07x/078/org/w3c/dom/events.js:2679-2726
/branches/07x/079/org/w3c/dom/events.js:2728-2745
/branches/07x/org/org/w3c/dom/events.js:2643
/branches/07x/org/w3c/dom/events.js:2356-2753
/branches/08x/080/org/w3c/dom/events.js:2758-2785
/branches/08x/081/org/w3c/dom/events.js:2787-2814
/branches/ufltima/dom/events.js:1621-1856
   + /branches/06x/061/org/w3c/dom/events.js:1864-2067
/branches/06x/062/org/w3c/dom/events.js:2071-2106
/branches/06x/063/org/w3c/dom/events.js:2110-2146
/branches/06x/064/org/w3c/dom/events.js:2149-2177
/branches/06x/065/org/w3c/dom/events.js:2179-2209
/branches/06x/066/org/w3c/dom/events.js:2211-2244
/branches/06x/067/org/w3c/dom/events.js:2257-2282
/branches/06x/068/org/w3c/dom/events.js:2284-2314
/branches/06x/069/org/w3c/dom/events.js:2317-2352
/branches/06x/org/w3c/dom/events.js:1861-2353
/branches/07x/070/org/w3c/dom/events.js:2363-2383
/branches/07x/071/org/w3c/dom/events.js:2385-2433
/branches/07x/072/org/w3c/dom/events.js:2435-2474
/branches/07x/073/org/w3c/dom/events.js:2476-2509
/branches/07x/074/org/w3c/dom/events.js:2511-2556
/branches/07x/075/org/w3c/dom/events.js:2558-2597
/branches/07x/076/org/w3c/dom/events.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/events.js:2635-2677
/branches/07x/078/org/w3c/dom/events.js:2679-2726
/branches/07x/079/org/w3c/dom/events.js:2728-2745
/branches/07x/org/org/w3c/dom/events.js:2643
/branches/07x/org/w3c/dom/events.js:2356-2753
/branches/08x/080/org/w3c/dom/events.js:2758-2785
/branches/08x/081/org/w3c/dom/events.js:2787-2814
/branches/08x/082/org/w3c/dom/events.js:2817-2843
/branches/ufltima/dom/events.js:1621-1856

Modified: branches/08x/org/w3c/dom/svg.js
===================================================================
--- branches/08x/org/w3c/dom/svg.js	2011-08-05 15:26:20 UTC (rev 2843)
+++ branches/08x/org/w3c/dom/svg.js	2011-08-06 10:16:59 UTC (rev 2844)
@@ -1690,14 +1690,7 @@
      *ここでは、responseTextを用いる
      */
     var dsd = new Date();
-    var ifr = document.createElement("iframe");
-    ifr.marginWidth = ifr.marginHeight = "0px"; //このマージン設定がないと、全体がずれてしまう
-    ifr.scrolling = "no";
-    ifr.frameBorder = "0";
-    /*iframe要素を使って、描画のプロセスを分離する
-     *したがって、_docはdocumentとは別のオブジェクトとなる
-     */
-    this._tar.parentNode.insertBefore(ifr, this._tar);
+    var ifr = this._tar.previousSibling;
     ifr.contentWindow.screen.updateInterval = 999;
     var _doc = ifr.contentWindow.document;
     _doc.write("");
@@ -1788,8 +1781,6 @@
       tar.setAttributeNodeNS(att);
     }
     str = attr = null;
-    ifr.style.width = tview.width+3+ "px";
-    ifr.style.height = tview.height+3+ "px";
     dcp.style.width = tview.width+ "px";
     dcp.style.height = tview.height+ "px";
     dcp.coordsize = tview.width+ " " +tview.height;
@@ -1876,8 +1867,7 @@
     }
     s.defaultView._cache = s.defaultView._cache_ele = null;
     oba = _doc = evt = _doc = objei = tar = tview = objw = objh = n = att = sdt = sp = dcp = backr = w = h = sw = sh = style = fontSize = null;
-    trstyle = tpstyle = backrs = viewWidth = viewHeight = text = texti = i = bfl = bft = bl = bt = backdown = backright = null;
-    text = _parseFloat = null;
+    trstyle = tpstyle = backrs = viewWidth = viewHeight = text = texti = i = bfl = bft = bl = bt = backdown = backright = text = _parseFloat = null;
     /*IEのメモリリーク対策として、空関数を入力*/
     this.xmlhttp.onreadystatechange = NAIBU.emptyFunction;
     alert(+(new Date()) - dsd.getTime())
@@ -1917,9 +1907,9 @@
           }
           dbuf = n = dbufli = null;
         }, 1);
-        s = null;
+        ifr = s = null;
       } else {
-        s = null;
+        ifr = s = null;
         NAIBU.Time.start();
       }
       delete NAIBU.doc;
@@ -4212,8 +4202,8 @@
             sty.top = p.y + "px";
             sty.width = "0px";
             sty.height = "0px";
-            sty.marginTop = tar._isYokogaki ? -n+ "px" : "0px";
-            sty.lineHeight = n+ "px";
+            sty.marginTop = tar._isYokogaki ? -n-10+ "px" : "-10px";
+            sty.lineHeight = n+10+ "px";
             ttp.appendChild(ti._tars[ij]);
             sty = p = null;
           }
@@ -4238,7 +4228,10 @@
           }
         }
       }
-      var color = style.getPropertyValue("fill");
+      var color = style.getPropertyValue("fill"),
+          cursor = style.getPropertyCSSValue("cursor"),
+          vis = style.getPropertyCSSValue("visibility"),
+          disp = style.getPropertyCSSValue("display");
       if (color === "none"){
         tar._tar.style.color = "transparent";
       } else if (color.indexOf("url") === -1) {
@@ -4246,14 +4239,19 @@
       } else {
         tar._tar.style.color = "black";
       }
-      var cursor = style.getPropertyValue("cursor");
-      if (cursor !== "auto" && cursor !== "") {
-        tar._tar.style.cursor = cursor;
+      if (cursor && !cursor._isDefault) { //初期値でないならば
+        var tc = cursor.cssText;
+        el.style.cursor = tc.substring(tc.indexOf(":")+1, tc.length);
+        tc = null;
       }
-      var vis = style.getPropertyValue("visibility");
-      if (vis !== "visiblee") {
-        tar._tar.style.visibility = vis;
+      if (vis　&& !vis._isDefault) {
+        el.style.visibility = vis.cssText.substring(vis.cssText.indexOf(":")+1, vis.cssText.length);
       }
+       if (disp && !disp._isDefault && (disp.cssText.indexOf("none") > -1)) {
+        el.style.display = "none";
+           　} else if (disp && !disp._isDefault) {
+        el.style.display = "block";
+      }
       var isRect = true;
       if (ttp.lastChild) {
         if (ttp.lastChild.nodeName !== "rect") {
@@ -4275,7 +4273,7 @@
       }
       delete tar._cacheMatrix;
       delete tar._currentStyle;
-      isRect = evt = tar = style = tpp = ttpc = null;
+      isRect = evt = tar = style = tpp = ttpc = style = color = cursor = disp = vis = null;
     }, false);
     evt = tar = null;
   },false);
@@ -6005,14 +6003,19 @@
   doc = data = null;
 };
 NAIBU._noie_createFont = function(/*Element*/ ti, /*Element*/ font, /*boolean*/ isMSIE) {
-  var style = ti.ownerDocument.defaultView.getComputedStyle(ti, ''), svgns = "http://www.w3.org/2000/svg";
-  //isTategakiは縦書きならば真
-  var isTategaki = ti.getAttributeNS(null, "writing-mode") || ti.parentNode.getAttributeNS(null, "writing-mode"), horizOrVert = isTategaki ? "vert-adv-y" : "horiz-adv-x";
-  var node = ti.firstChild, data, glyphs = font.getElementsByTagNameNS(svgns, "glyph");
-  var em = parseFloat(font.getElementsByTagNameNS(svgns, "font-face").item(0).getAttribute("units-per-em") || 1000);
-  var advX = parseFloat( (font.getAttributeNS(null, horizOrVert) || 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",
+  var style = ti.ownerDocument.defaultView.getComputedStyle(ti, ''),
+      svgns = "http://www.w3.org/2000/svg",
+      //isTategakiは縦書きならば真
+      isTategaki = ti.getAttributeNS(null, "writing-mode") || ti.parentNode.getAttributeNS(null, "writing-mode"),
+      horizOrVert = isTategaki ? "vert-adv-y" : "horiz-adv-x",
+      node = ti.firstChild, data, glyphs = font.getElementsByTagNameNS(svgns, "glyph"),
+      em = parseFloat(font.getElementsByTagNameNS(svgns, "font-face").item(0).getAttributeNS(null, "units-per-em") || 1000),
+      advX = parseFloat( (font.getAttributeNS(null, horizOrVert) || em) ), //字幅の設定
+      dx = parseFloat(ti.getAttributeNS(null, "x") || 0),
+      dy = parseFloat(ti.getAttributeNS(null, "y") || 0),
+      fontSize = parseFloat(style.getPropertyValue("font-size")),
+      fe = fontSize / em;
+      ds = false, npdlist = ["fill",
   "fill-opacity",
   "stroke",
   "stroke-width",
@@ -6023,15 +6026,6 @@
   "stroke-opacity",
   "opacity",
   "cursor"];
-  if (isMSIE) {
-    var rand = "n" +Math.random();
-    ti._tar.firstChild.setAttribute("id", rand);
-    var titf = ti.ownerDocument._document_.getElementById(rand);
-    /*IEのみ、font-sizeは自動で調整されている（つまり、DOMからよびだされた）ものを使った方がよい*/
-    fontSize = parseFloat(titf.currentStyle.fontSize);
-    fe = fontSize / em;
-    rand = titf = null;
-  }
   if (/a/[-1] === 'a') { //Firefoxならば
     ds = true;
   } else if (isMSIE || isTategaki) {
@@ -6180,7 +6174,8 @@
  */
 NAIBU._main = (function() {
   stlog = new STLog(true);
-  var xmlhttp; //XMLHttpオブジェクトを生成
+  var xmlhttp,         //XMLHttpオブジェクトを生成
+      _doc = document; //documentのエイリアスを作成
   try {
     xmlhttp = new ActiveXObject("Msxml2.XMLHTTP");
   } catch (e) {
@@ -6199,24 +6194,25 @@
   }
   NAIBU.xmlhttp = xmlhttp;
   var nd;
-  if (("namespaces" in document) && !document.namespaces["v"]) {
+  if (("namespaces" in _doc) && !_doc.namespaces["v"]) {
     NAIBU.doc = new ActiveXObject("MSXML2.DomDocument");
     nd = NAIBU.doc;
-    document.namespaces.add("v","urn:schemas-microsoft-com:vml");
-    document.namespaces.add("o","urn:schemas-microsoft-com:office:office");
-    var st = document.createStyleSheet();
+    _doc.namespaces.add("v","urn:schemas-microsoft-com:vml");
+    _doc.namespaces.add("o","urn:schemas-microsoft-com:office:office");
+    var st = _doc.createStyleSheet();
     var vmlUrl = "behavior: url(#default#VML);display: inline-block;} "; //inline-blockはIEのバグ対策
     st.cssText = "v\\:rect{" +vmlUrl+ "v\\:image{" +vmlUrl+ "v\\:fill{" +vmlUrl+ "v\\:stroke{" +vmlUrl+ "o\\:opacity2{" +vmlUrl
       + "dn\\:defs{display:none}"
       + "v\\:group{text-indent:0px;position:relative;width:100%;height:100%;" +vmlUrl
       + "v\\:shape{width:100%;height:100%;" +vmlUrl;
   }
-  var ary = document.getElementsByTagName("script");
+  var ary = _doc.getElementsByTagName("script");
   //全script要素をチェックして、type属性がimage/svg+xmlならば、中身をSVGとして処理する
-  for (var i=0; i < ary.length; ++i) {
-    var hoge = ary[i].type;
-    if (ary[i].type === "image/svg+xml") {
-      var ait = ary[i].text;
+  for (var i=0; ary[i]; ++i) {
+    var ai = ary[i],
+        hoge = ai.type;
+    if (ai.type === "image/svg+xml") {
+      var ait = ai.text;
       if (sieb_s && ait.match(/&lt;svg/)) {
         //ソース内のタグを除去
         ait = ait.replace(/<.+?>/g, "");
@@ -6224,7 +6220,7 @@
         ait = ait.replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&amp;/g, "&");
       }
       if (NAIBU.isMSIE) {
-        var gsd = new GetSVGDocument(ary[i]);
+        var gsd = new GetSVGDocument(ai);
         gsd.xmlhttp = {
           readyState : 4,
           status : 200,
@@ -6234,29 +6230,55 @@
       } else {
         var base = location.href.replace(/\/[^\/]+?$/,"/"); //URIの最後尾にあるファイル名は消す。例: /n/sie.js -> /n/
         ait = ait.replace(/\shref=(['"a-z]+?):\/\//g, " target='_top' xlink:href=$1://").replace(/\shref=(.)/g, " target='_top' xlink:href=$1"+base);
-        var s = NAIBU.textToSVG(ait,ary[i].getAttribute("width"),ary[i].getAttribute("height"));
-        ary[i].parentNode.insertBefore(s,ary[i]);
+        var s = NAIBU.textToSVG(ait,ai.getAttribute("width"),ai.getAttribute("height"));
+        ai.parentNode.insertBefore(s,ai);
       }
-      ait = null;
+      ai = ait = null;
     }
     hoge = null;
   }
   NAIBU.doc = nd;
   nd = ary = null;
   if (xmlhttp && NAIBU.isMSIE) {
-    if (!!document.createElementNS && !!document.createElementNS( "http://www.w3.org/2000/svg", "svg").createSVGRect) { //IE9ならば
+    if (!!_doc.createElementNS && !!_doc.createElementNS( "http://www.w3.org/2000/svg", "svg").createSVGRect) { //IE9ならば
     } else { //IE6-8ならば
-      var oba = document.createElement("div");
-      oba.setAttribute("id","_NAIBU_outline");
-      document.body.appendChild(oba);
-      var ob = document.getElementsByTagName("object"), em = document.getElementsByTagName("embed");
-      var i = 0, s=[];
-      for (;i<ob.length;++i) {
-        s[s.length] = new GetSVGDocument(ob[i]);
+      var ob = _doc.getElementsByTagName("object"),
+          em = _doc.getElementsByTagName("embed"),
+          i = 0,
+          s=[],
+          ifr, obi, n;
+      for (;ob[i];++i) {
+        obi = ob[i];
+        s[s.length] = new GetSVGDocument(obi);
+        ifr = _doc.createElement("iframe");
+        ifr.style.background = "black";
+        n = obi.getAttribute("width");
+        n && ifr.setAttribute("width", n);
+        n = obi.getAttribute("height");
+        n && ifr.setAttribute("height", n);
+        ifr.marginWidth = ifr.marginHeight = "0px"; //このマージン設定がないと、全体がずれてしまう
+        ifr.scrolling = "no";
+        ifr.frameBorder = "0";
+        /*iframe要素を使って、描画のプロセスを分離する
+         *したがって、_docはdocumentとは別のオブジェクトとなる
+         */
+        obi.parentNode.insertBefore(ifr, obi);
       }
-      for (i=0;i<em.length;++i) {
-        s[s.length] = new GetSVGDocument(em[i]);
+      for (i=0;em[i];++i) {
+        obi = em[i];
+        s[s.length] = new GetSVGDocument(obi);
+        ifr = _doc.createElement("iframe");
+        ifr.style.background = "black";
+        n = obi.getAttribute("width");
+        n && ifr.setAttribute("width", n);
+        n = obi.getAttribute("height");
+        n && ifr.setAttribute("height", n);
+        ifr.marginWidth = ifr.marginHeight = "0px"; //このマージン設定がないと、全体がずれてしまう
+        ifr.scrolling = "no";
+        ifr.frameBorder = "0";
+        obi.parentNode.insertBefore(ifr, obi);
       }
+      ob = em = i = obi = ifr = null;
       for (i=0;i<s.length;++i) {
         if (i < s.length-1) {
           s[i]._next = s[i+1]
@@ -6268,17 +6290,17 @@
       s = null;
     }
   } else {
-    var ob = document.getElementsByTagName("object");
+    var ob = _doc.getElementsByTagName("object");
     for (var i=0;i<ob.length;++i) {
       if (ob[i].contentDocument) {
         NAIBU._fontSearchURI({target:{ownerDocument:ob[i].contentDocument}});
       } else if (ob[i].getSVGDocument) {
-        ob[i].getSVGDocument().documentElement.addEventListener("SVGLoad", NAIBU._fontSearchURI, false);
+        ob[i].getSVGDocument()._docElement.addEventListener("SVGLoad", NAIBU._fontSearchURI, false);
       } else {
       }
     }
   }
-  xmlhttp = null;
+  xmlhttp = _doc = null;
 });
 NAIBU.addEvent("load", NAIBU._main);
 NAIBU.utf16 = function ( /*string*/ s)  {


Property changes on: branches/08x/org/w3c/dom/svg.js
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/svg.js:2635-2677
/branches/07x/078/org/w3c/dom/svg.js:2679-2726
/branches/07x/079/org/w3c/dom/svg.js:2728-2746
/branches/07x/org/org/w3c/dom/svg.js:2643
/branches/07x/org/w3c/dom/svg.js:2356-2753
/branches/08x/080/org/w3c/dom/svg.js:2758-2785
/branches/08x/081/org/w3c/dom/svg.js:2787-2814
/branches/ufltima/dom/svg.js:1621-1856
   + /branches/06x/061/org/w3c/dom/svg.js:1864-2067
/branches/06x/062/org/w3c/dom/svg.js:2071-2106
/branches/06x/063/org/w3c/dom/svg.js:2110-2146
/branches/06x/064/org/w3c/dom/svg.js:2149-2177
/branches/06x/065/org/w3c/dom/svg.js:2179-2209
/branches/06x/066/org/w3c/dom/svg.js:2211-2239
/branches/06x/067/org/w3c/dom/svg.js:2257-2282
/branches/06x/068/org/w3c/dom/svg.js:2284-2314
/branches/06x/069/org/w3c/dom/svg.js:2317-2352
/branches/06x/org/w3c/dom/svg.js:1861-2353
/branches/07x/070/org/w3c/dom/svg.js:2363-2383
/branches/07x/071/org/w3c/dom/svg.js:2385-2433
/branches/07x/072/org/w3c/dom/svg.js:2435-2474
/branches/07x/073/org/w3c/dom/svg.js:2476-2509
/branches/07x/074/org/w3c/dom/svg.js:2511-2556
/branches/07x/075/org/w3c/dom/svg.js:2558-2597
/branches/07x/076/org/w3c/dom/svg.js:2600-2631,2642
/branches/07x/077/org/w3c/dom/svg.js:2635-2677
/branches/07x/078/org/w3c/dom/svg.js:2679-2726
/branches/07x/079/org/w3c/dom/svg.js:2728-2746
/branches/07x/org/org/w3c/dom/svg.js:2643
/branches/07x/org/w3c/dom/svg.js:2356-2753
/branches/08x/080/org/w3c/dom/svg.js:2758-2785
/branches/08x/081/org/w3c/dom/svg.js:2787-2814
/branches/08x/082/org/w3c/dom/svg.js:2817-2843
/branches/ufltima/dom/svg.js:1621-1856


Sie-announce メーリングリストの案内
Back to archive index