svnno****@sourc*****
svnno****@sourc*****
2010年 5月 31日 (月) 21:20:12 JST
ForkRevision: 1851
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1851
Author: dhrname
Date: 2010-05-31 21:20:12 +0900 (Mon, 31 May 2010)
Log Message:
-----------
0.60統合
Modified Paths:
--------------
branches/06x/sie.js
Property Changed:
----------------
branches/06x/sie.js
Modified: branches/06x/sie.js
===================================================================
--- branches/06x/sie.js 2010-05-31 11:10:36 UTC (rev 1850)
+++ branches/06x/sie.js 2010-05-31 12:20:12 UTC (rev 1851)
@@ -45,7 +45,7 @@
//これを頭に付けたら、内部処理用
var NAIBU = {};
SIE = {
- version : 0.58
+ version : 0.60
};
//documentを速くするために
/*@cc_on _d=document;eval('var document=_d')@*/
@@ -490,7 +490,7 @@
tts.height = "0px";
this.paint.fset(w,h,ttm);
//以下は、テキストの幅であるtextLengthを算出する
- var arr = this.tspan, textLength = 0, fontSize = this.paint.fontSize, atfontSize = 0, fij = /[fijlt.,:;1]/g; //fontSizeは親要素の文字サイズ。atfontSizeは各span要素のサイズ。
+ var arr = this.tspan, textLength = 0, fontSize = this.paint.fontSize, atfontSize = 0, fij = /[fijlt.,:;1\-]/g; //fontSizeは親要素の文字サイズ。atfontSizeは各span要素のサイズ。
for (var i=0,s={dx:0,dy:0},arri=arr.length;i<arri;++i) {
var ari = arr[i];
ari.paint.fset(w,h,ari.transformable);
@@ -751,7 +751,7 @@
if (isM[com] && Fli > 3) { //MoveToが複数の座標ならば、2番目以降の座標ペアをLineToとして処理
F.splice(3, 0, "l");
}
- rx = ry = null;
+ Fli = rx = ry = null;
}
dat += F.join(" ");
com = F = null;
@@ -761,7 +761,7 @@
ele.path = dat + " e";
ele.coordsize = w + " " + h;
this.paint.set(w, h, ttm);
- ele = dat = this.paint = ttm = this.transformable = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = w = h = null; //解放
+ i = dli = dili = j = ele = dat = this.paint = ttm = this.transformable = preCom = x = y = x0 = y0 = dx = dy = tma = tmb = tmc = tmd = tme = tmf = w = h = null; //解放
};
})();
//QからCに変換
@@ -769,7 +769,7 @@
F[0] = "c";
for (var i = 1; i < F.length; i += 6) {
var x1 = F[i], y1 = F[i+1], x2 = F[i+2], y2 = F[i+3];
- F.splice(i, 2, (x + 2 * x1) / 3, (y + 2 * y1) / 3, (2 * x1 + x2) / 3, (2 * y1 + y2) / 3);
+ F.splice(i, 2, (x + 2*x1) / 3, (y + 2*y1) / 3, (2*x1 + x2) / 3, (2*y1 + y2) / 3);
x = x2; y = y2;
}
return F;
@@ -1182,7 +1182,7 @@
fillElement.setAttribute("color", this.color(this.fill));
var fillOpacity = this.fillopacity * this.opacity; //opacityを掛け合わせる
if (fillOpacity < 1) {
- fillElement.setAttribute("opacity", fillOpacity);
+ fillElement.setAttribute("opacity", fillOpacity+"");
}
}
} catch(e) {stlog.add(e,682); fillElement.on = "true";
@@ -1418,8 +1418,8 @@
ele.setAttribute("color2", color[length-1]);
ele.setAttribute("colors", colors.join(","));
// When colors attribute is used, the meanings of opacity and o:opacity2 are reversed.
- ele.setAttribute("opacity", opacity[length-1]);
- ele.setAttribute("o:opacity2", opacity[0]);
+ ele.setAttribute("opacity", opacity[length-1]+ "");
+ ele.setAttribute("o:opacity2", opacity[0]+ "");
var type = grad.getAttribute("type"), toNumber = this.toNumber;
if (type === "gradient") {
try {
@@ -1536,13 +1536,15 @@
for (var i in this) {
var ti = this[i];
if ((typeof ti) === "string") { //string型以外は除く
- var sname = i.replace(/\-([a-z])/, "-").replace(/\-/,RegExp.$1.toUpperCase());
+ var sname = i.replace(/\-([a-z])/, "-"), s =RegExp.$1.toUpperCase();
+ sname = sname.replace(/\-/, s);
if (ti === "lr") {
ti = "lr-tb";
} else if (ti === "tb") {
ti = "tb-rl";
}
tst.style[sname] = ti;
+ sname = s = ti = null;
}
}
} catch(e) {stlog.add(e,1396); return "";}
@@ -1978,11 +1980,8 @@
var egbase = ele.getAttribute("xml:base");
if (!egbase) {
var ep = ele.parentNode, b = null;
- while(!b && ep.tagName === "group") {
+ while (!b && ep.tagName === "group") {
b = ep.getAttribute("xml:base");
- if (b) {
- break;
- }
ep = ep.parentNode;
}
base = b;
@@ -1990,16 +1989,16 @@
if (href.indexOf("#") !== 0) { //href属性において#が一番につかない場合
var lh = location.href;
base = lh.replace(/\/[^\/]+?$/,"/"); //URIの最後尾にあるファイル名は消す。例: /n/sie.js -> /n/
- } else{
+ } else {
base = location.href;
}
}
- } else{
- base = egbase;
+ } else {
+ base = egbase;
}
if (href.indexOf(":") === -1) {
this.base = base;
- } else{
+ } else {
this.base ="";
}
this.href = href;
@@ -2034,7 +2033,7 @@
}
if (this.title) {
var node = this.tar.firstChild;
- while(node) {
+ while (node) {
if (node.nodeType === 1) {
node.setAttribute("title", this.title);
}
Property changes on: branches/06x/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/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