svnno****@sourc*****
svnno****@sourc*****
2010年 11月 24日 (水) 22:37:46 JST
ForkRevision: 2172
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2172
Author: dhrname
Date: 2010-11-24 22:37:45 +0900 (Wed, 24 Nov 2010)
Log Message:
-----------
NAIBU._setPaint関数の修正
Modified Paths:
--------------
branches/06x/064/org/w3c/dom/svg.js
Modified: branches/06x/064/org/w3c/dom/svg.js
===================================================================
--- branches/06x/064/org/w3c/dom/svg.js 2010-11-24 13:24:52 UTC (rev 2171)
+++ branches/06x/064/org/w3c/dom/svg.js 2010-11-24 13:37:45 UTC (rev 2172)
@@ -2174,8 +2174,12 @@
}
if (!!tar._fillElement) {
var fillElement = tar._fillElement;
- /*あらかじめ消しおかないと、効果が出ない*/
- el.removeChild(fillElement);
+ var tgebtfill = el.getElementsByTagName("fill");
+ if (tgebtfill.length > 0) {
+ /*あらかじめ消しおかないと、効果が出ない*/
+ el.removeChild(tgebtfill[0]);
+ }
+ tgebtfill = null;
} else {
var fillElement = document.createElement("v:fill");
}
@@ -2219,7 +2223,11 @@
}
if (!!tar._strokeElement) {
var strokeElement = tar._strokeElement;
- el.removeChild(strokeElement);
+ var tgebtstroke = el.getElementsByTagName("stroke")
+ if (tgebtstroke.length > 0) {
+ el.removeChild(tgebtstroke[0]);
+ }
+ tgebtstroke = null;
} else {
var strokeElement = document.createElement("v:stroke");
}
@@ -5087,7 +5095,7 @@
} else {
return;
}
- var fc = _tar._valueList[ii], tc = _tar._valueList[ii+1], di = (_tar._keyTimes[ii+1] - _tar._keyTimes[ii]) * d, durd = (tg-tar._keyTimes[ii]*d) / di, num = CSSPrimitiveValue.CSS_NUMBER;
+ var fc = _tar._valueList[ii].rgbColor, tc = _tar._valueList[ii+1].rgbColor, di = (_tar._keyTimes[ii+1] - _tar._keyTimes[ii]) * d, durd = (tg-tar._keyTimes[ii]*d) / di, num = CSSPrimitiveValue.CSS_NUMBER;
var fr = fc.red.getFloatValue(num), fg = fc.green.getFloatValue(num), fb = fc.blue.getFloatValue(num);
var r = fr + (tc.red.getFloatValue(num) - fr) * durd;
var g = fg + (tc.green.getFloatValue(num) - fg) * durd;