svnno****@sourc*****
svnno****@sourc*****
2009年 6月 5日 (金) 22:27:45 JST
ForkRevision: 1202
http://svn.sourceforge.jp/view?root=sie&view=rev&rev=1202
Author: dhrname
Date: 2009-06-05 22:27:45 +0900 (Fri, 05 Jun 2009)
Log Message:
-----------
0.50統合
Modified Paths:
--------------
branches/05x/sie.js
Property Changed:
----------------
branches/05x/sie.js
Modified: branches/05x/sie.js
===================================================================
--- branches/05x/sie.js 2009-06-04 11:09:04 UTC (rev 1201)
+++ branches/05x/sie.js 2009-06-05 13:27:45 UTC (rev 1202)
@@ -54,7 +54,7 @@
//IEだったらtrueを返す
var isMSIE = /*@cc_on!@*/false;
//引数にtrueがあれば、例外処理のログを作動させる
- stlog = new STLog(false);
+ stlog = new STLog(true);
var ary = document.getElementsByTagName("script");
for (var i=0; i < ary.length; i++) {//全script要素をチェックして、type属性がimage/svg+xmlならば、中身をSVGとして処理する
var hoge = ary[i].type;
@@ -101,7 +101,7 @@
document.namespaces.add("o","urn:schemas-microsoft-com:office:office");
var st = document.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
+ st.cssText = "v:group div{text-indent:0px;} v\\:rect{" +vmlUrl+ "v\\:image{" +vmlUrl+ "v\\:fill{" +vmlUrl+ "v\\:stroke{" +vmlUrl+ "o\\:opacity2{" +vmlUrl
+ "dn\\:defs{display:none}"
+ "v\\:group{position:relative;width:100%;height:100%;" +vmlUrl
+ "v\\:shape{width:100%;height:100%;" +vmlUrl;
@@ -207,12 +207,12 @@
var tis = texti.style;
tis.left = parseFloat(tis.left) + bl + "px";
tis.top = parseFloat(tis.top) + bt + "px";
+ //以下はdiv要素がa要素のスタイルを継承しないので必要
var tp = texti.parentNode;
while (tp.nodeName === "group") { //group要素である限り、さかのぼる
tp = tp.parentNode;
}
if (tp.nodeName === "A") { //先祖要素がa要素ならば
- tis.marginLeft = -parseFloat(tis.fontSize)+ "px";
tis.cursor = "hand";
}
}
@@ -1318,7 +1318,7 @@
background.style.position = "absolute";
background.style.textAlign = "left"; background.style.top = "0px"; background.style.left = "0px"; background.style.width = this.w+ "px"; background.style.height = this.h+ "px";
outline.appendChild(background);
- background.style.filter = "progid:DXImageTransform.Microsoft.Compositor";
+ background.style.filter = "'progid:DXImageTransform.Microsoft.Compositor'";
background.filters.item('DXImageTransform.Microsoft.Compositor').Function = 23;
var circle = '<v:shape style="position:relative; antialias:false; top:0px; left:0px;" coordsize="' +this.w+ ' ' +this.h+ '" path="' +ellipse+ '" stroked="f">' +ele.outerHTML+ '</v:shape>';
background.innerHTML = '<v:shape style="position:relative; top:0px; left:0px;" coordsize="' +this.w+ ' ' +this.h+ '" path="' +data+ '" stroked="f" fillcolor="' +color[color.length-1]+ '" ></v:shape>';
@@ -1401,7 +1401,9 @@
tts.color = this.fill === "none" ? "transparent" : this.fill;
this.fontSize = fontset(this["font-size"],w,h,matrix);
tts.fontSize = this.fontSize+ "px";
- if (this.cursor !== "default") {tts.cursor = this.cursor;}
+ if (this.cursor !== "default") {
+ tts.cursor = this.cursor;
+ }
this.writingMode = tts.writingMode;
tts.marginTop = (this.writingMode === "tb-rl") ? "0px" : -parseFloat(tts.fontSize)+ "px";
} catch(e){stlog.add(e,1185);}
Property changes on: branches/05x/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/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