svnno****@sourc*****
svnno****@sourc*****
2010年 1月 4日 (月) 23:32:43 JST
Revision: 1531
http://sourceforge.jp/projects/sie/svn/view?view=rev&revision=1531
Author: dhrname
Date: 2010-01-04 23:32:43 +0900 (Mon, 04 Jan 2010)
Log Message:
-----------
Modified Paths:
--------------
branches/05x/sie.js
Property Changed:
----------------
branches/05x/sie.js
Modified: branches/05x/sie.js
===================================================================
--- branches/05x/sie.js 2010-01-04 14:21:28 UTC (rev 1530)
+++ branches/05x/sie.js 2010-01-04 14:32:43 UTC (rev 1531)
@@ -95,19 +95,24 @@
if (/a/[-1] === 'a'){ //Firefoxだったらtrueを返す
NAIBU.STObject.ffnext();
}
- var off = (!!window.opera)? 2000 : 500;
- setTimeout(_noie_svgfont, off);
if (navigator.appVersion.indexOf("Version/3") > -1) { //Safariがバージョン3ならば
NAIBU.STObject.startAnime();
+ _noie_svgfont();
+ } else {
+ var off = (!!window.opera)? 2000 : 500;
+ NAIBU.stopFont = setTimeout(_noie_svgfont, off);
}
}
window.onload = null;
}
//他のページに移動する際に起動
function unsvgtovml() {
- if (NAIBU.Clip.length > 0) {
+ if (!!NAIBU.stop) {
clearInterval(NAIBU.stop);
}
+ if (!!NAIBU.stopFont) {
+ clearTimeout(NAIBU.stopFont);
+ }
NAIBU = stlog = STLog = SIE = null;
}
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/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/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-1530