svnno****@sourc*****
svnno****@sourc*****
2011年 3月 21日 (月) 20:07:51 JST
Revision: 2493
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=2493
Author: dhrname
Date: 2011-03-21 20:07:50 +0900 (Mon, 21 Mar 2011)
Log Message:
-----------
SVGURIReferenceのvar文において、showが設定されていなかったので修正
Modified Paths:
--------------
branches/07x/073/org/w3c/dom/svg.js
Modified: branches/07x/073/org/w3c/dom/svg.js
===================================================================
--- branches/07x/073/org/w3c/dom/svg.js 2011-03-21 11:03:59 UTC (rev 2492)
+++ branches/07x/073/org/w3c/dom/svg.js 2011-03-21 11:07:50 UTC (rev 2493)
@@ -952,7 +952,7 @@
var tar = evt.target,
base,
href = tar.href.baseVal,
- egbase, ep, b, lh, uri, xmlhttp, ui, id, doc, ele, ev;
+ show, egbase, ep, b, lh, uri, xmlhttp, ui, id, doc, ele, ev;
/*xlink:href属性とxml:base属性を手がかりに、
*ハイパーリンクのURIを決定する処理を行う
*/
@@ -1006,8 +1006,6 @@
ev = doc.createEvent("SVGEvents");
ev.initEvent("SVGLoad", false, false);
tar.dispatchEvent(ev);
- ev = null;
- ele = null;
} else if (uri.indexOf("data:") > -1) {
tar._tar.src = uri;
} else if ((uri.indexOf("http:") > -1) || (uri.indexOf(".") === 0)){
@@ -1059,7 +1057,7 @@
}
}
}
- evt = tar = base = href = egbase = ep = b = lh = uri = xmlhttp = ui = id = doc = ele = ev = null;
+ evt = tar = base = href = egbase = ep = b = lh = uri = xmlhttp = ui = id = doc = ele = ev = show= null;
}, false);
tar = evt = null;
}, false);
@@ -1151,11 +1149,16 @@
if (evt.eventPhase === Event.BUBBLING_PHASE) {
return; //強制終了させる
}
- var tar = evt.target, name = evt.attrName;
+ var tar = evt.target,
+ name = evt.attrName,
+ tv,
+ ovb,
+ par,
+ tp;
if (name === "viewBox") {
tar._cacheScreenCTM = null;
- var tv = tar.viewBox.baseVal;
- var ovb = evt.newValue.replace(/^\s+|\s+$/g, "").split(/[\s,]+/);
+ tv = tar.viewBox.baseVal;
+ ovb = evt.newValue.replace(/^\s+|\s+$/g, "").split(/[\s,]+/);
tv.x = parseFloat(ovb[0]);
tv.y = parseFloat(ovb[1]);
tv.width = parseFloat(ovb[2]);
@@ -1163,7 +1166,8 @@
tar.viewBox.baseVal._isUsed = 1;
} else if (name === "preserveAspectRatio") {
tar._cacheScreenCTM = null;
- var par = evt.newValue, tp = tar.preserveAspectRatio.baseVal;
+ par = evt.newValue;
+ tp = tar.preserveAspectRatio.baseVal;
var sa = 1, mos = SVGPreserveAspectRatio.SVG_MEETORSLICE_UNKNOWN;
if (!!par.match(/x(Min|Mid|Max)Y(Min|Mid|Max)(?:\s+(meet|slice))?/)) {
switch (RegExp.$1) {