svnno****@sourc*****
svnno****@sourc*****
2009年 6月 9日 (火) 22:14:47 JST
Revision: 1210 http://svn.sourceforge.jp/view?root=sie&view=rev&rev=1210 Author: dhrname Date: 2009-06-09 22:14:47 +0900 (Tue, 09 Jun 2009) Log Message: ----------- 0.50統合 Modified Paths: -------------- trunk/sie.js Property Changed: ---------------- trunk/sie.js Modified: trunk/sie.js =================================================================== --- trunk/sie.js 2009-06-07 13:44:27 UTC (rev 1209) +++ trunk/sie.js 2009-06-09 13:14:47 UTC (rev 1210) @@ -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"; } } @@ -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: 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/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/sie.js:1183-1209