OSDN > Developer >

sado > Chamber > gikonavi > Commit

sado

gikonavi
Fork

Fork origin: gikonavigoeson / gikonavi

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	cbcd6af9e05c46a72d5dce1c1156d5e4dccffc5e (tree)
Time	2006-05-31 01:07:26
Author	cvs2git <cvs2git>
Commiter	cvs2git

Log Message

This commit was manufactured by cvs2svn to create tag 'v1_52_0_652'.

Change Summary

modified: Doxyfile (diff)
modified: Editor.dfm (diff)
modified: Editor.pas (diff)
modified: Giko.dfm (diff)
modified: Giko.pas (diff)
modified: GikoDataModule.dfm (diff)
modified: GikoDataModule.pas (diff)
modified: InputAssist.pas (diff)
modified: InputAssistDataModule.pas (diff)
modified: KuroutSetting.dfm (diff)
modified: KuroutSetting.pas (diff)
modified: Option.dfm (diff)
modified: Setting.pas (diff)
modified: gikoNavi.res (diff)
modified: readme/readme.txt (diff)
modified: res/skin/skin30-2G/Header.html (diff)
modified: res/skin/skin30-2G/chie_base.css (diff)
modified: res/skin/skin30-2G/chie_event.js (diff)
modified: res/skin/skin30-2G/chie_image.css (diff)
modified: res/skin/skin30-2G/chie_image.js (diff)
modified: res/skin/skin30-2G/chie_popup.js (diff)
modified: res/skin/skin30-2G/chie_search.js (diff)
modified: res/skin/skin30-3G/Header.html (diff)
modified: res/skin/skin30-3G/chie_base.css (diff)
modified: res/skin/skin30-3G/chie_event.js (diff)
modified: res/skin/skin30-3G/chie_image2.js (diff)
modified: res/skin/skin30-3G/chie_popup.js (diff)
modified: res/skin/skin30-3G/chie_search.js (diff)

Incremental Difference

--- a/Doxyfile

+++ b/Doxyfile

		@@ -1,14 +1,14 @@
1		-# Doxyfile 1.4.6
	1	+# Doxyfile 1.4.5
2	2
3	3	#---------------------------------------------------------------------------
4	4	# Project related configuration options
5	5	#---------------------------------------------------------------------------
6	6	PROJECT_NAME = gikonavi
7		-PROJECT_NUMBER = "b52 rev. 598"
	7	+PROJECT_NUMBER = b51
8	8	OUTPUT_DIRECTORY =
9	9	CREATE_SUBDIRS = NO
10	10	OUTPUT_LANGUAGE = Japanese
11		-USE_WINDOWS_ENCODING = YES
	11	+USE_WINDOWS_ENCODING = NO
12	12	BRIEF_MEMBER_DESC = YES
13	13	REPEAT_BRIEF = YES
14	14	ABBREVIATE_BRIEF =

		@@ -25,7 +25,7 @@ INHERIT_DOCS = YES
25	25	SEPARATE_MEMBER_PAGES = NO
26	26	TAB_SIZE = 2
27	27	ALIASES =
28		-OPTIMIZE_OUTPUT_FOR_C = YES
	28	+OPTIMIZE_OUTPUT_FOR_C = NO
29	29	OPTIMIZE_OUTPUT_JAVA = NO
30	30	BUILTIN_STL_SUPPORT = NO
31	31	DISTRIBUTE_GROUP_DOC = NO

		@@ -43,11 +43,11 @@ HIDE_UNDOC_CLASSES = NO
43	43	HIDE_FRIEND_COMPOUNDS = NO
44	44	HIDE_IN_BODY_DOCS = NO
45	45	INTERNAL_DOCS = NO
46		-CASE_SENSE_NAMES = NO
	46	+CASE_SENSE_NAMES = YES
47	47	HIDE_SCOPE_NAMES = NO
48	48	SHOW_INCLUDE_FILES = YES
49	49	INLINE_INFO = YES
50		-SORT_MEMBER_DOCS = NO
	50	+SORT_MEMBER_DOCS = YES
51	51	SORT_BRIEF_DOCS = NO
52	52	SORT_BY_SCOPE_NAME = NO
53	53	GENERATE_TODOLIST = YES

		@@ -83,13 +83,13 @@ EXAMPLE_PATH =
83	83	EXAMPLE_PATTERNS =
84	84	EXAMPLE_RECURSIVE = NO
85	85	IMAGE_PATH =
86		-INPUT_FILTER = "pas2dox --sjis "
	86	+INPUT_FILTER = pas2doxj.bat
87	87	FILTER_PATTERNS =
88	88	FILTER_SOURCE_FILES = YES
89	89	#---------------------------------------------------------------------------
90	90	# configuration options related to source browsing
91	91	#---------------------------------------------------------------------------
92		-SOURCE_BROWSER = YES
	92	+SOURCE_BROWSER = NO
93	93	INLINE_SOURCES = NO
94	94	STRIP_CODE_COMMENTS = YES
95	95	REFERENCED_BY_RELATION = YES

--- a/Editor.dfm

+++ b/Editor.dfm

		@@ -1,6 +1,6 @@
1	1	object EditorForm: TEditorForm
2		- Left = 306
3		- Top = 172
	2	+ Left = 432
	3	+ Top = 258
4	4	Width = 640
5	5	Height = 449
6	6	HorzScrollBar.Visible = False

		@@ -482,7 +482,7 @@ object EditorForm: TEditorForm
482	482	Left = 72
483	483	Top = 124
484	484	Bitmap = {
485		- 494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
	485	+ 494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
486	486	0000000000003600000028000000400000004000000001002000000000000040
487	487	0000000000000000000000000000000000000000000000000000000000000000
488	488	0000000000000000000000000000000000000000000000000000000000000000

		@@ -1014,14 +1014,13 @@ object EditorForm: TEditorForm
1014	1014	FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFF7F887
1015	1015	0003003FC1F7FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
1016	1016	0003C400DCF7FEBF0003CC00FF0FFC9F0003D400FFFFFDDF0003F800FFFFFDDF
1017		- FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
1018		- 000000000000}
	1017	+ FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
1019	1018	end
1020	1019	object HotToobarImageList: TImageList
1021	1020	Left = 104
1022	1021	Top = 124
1023	1022	Bitmap = {
1024		- 494C01010C000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
	1023	+ 494C01010C000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
1025	1024	0000000000003600000028000000400000004000000001002000000000000040
1026	1025	0000000000000000000000000000000000000000000000000000000000000000
1027	1026	0000000000000000000000000000000000000000000000000000000000000000

		@@ -1553,8 +1552,7 @@ object EditorForm: TEditorForm
1553	1552	FFF3000FFFFFF0CFFF010007FFFFF08700000003FFFFF08700010003FFE7F887
1554	1553	0003003FC1F3FE8F0003003FC3FBFE3F00038FFFC7FBFF7F0003FC00CBFBFE3F
1555	1554	0003C400DCF3FEBF0003CC00FF07FC9F0003D400FFFFFDDF0003F800FFFFFDDF
1556		- FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF00000000000000000000000000000000
1557		- 000000000000}
	1555	+ FFFFFC00FFFFFDDFFFFFFC00FFFFFFFF}
1558	1556	end
1559	1557	object Indy: TIdHTTP
1560	1558	Intercept = IdLogDebug

--- a/Editor.pas

+++ b/Editor.pas

		@@ -855,7 +855,7 @@ begin
855	855
856	856	Cookie := '';
857	857	if ACOOKIE <> '' then
858		- Cookie := ACOOKIE;
	858	+ Cookie := ACOOKIE;
859	859	if SPID <> '' then
860	860	Cookie := Cookie + 'SPID=' + SPID + '; ';
861	861	if PON <> '' then

		@@ -864,19 +864,9 @@ begin
864	864	//zXgª2chÅABeÉLoginµÄ¢êÎBEÌf[^ðé
865	865	//GikoSys.ParseURI( URL, Protocol,Host, Path, Document, Port, Bookmark );
866	866	//if GikoSys.Is2chHost(Host) and GikoSys.Setting.BeLogin then
867		- if (Board.Is2ch) then begin
868		- // ÅèÌNbL[ª êÎHí¹é
869		- if Length(GikoSys.Setting.FixedCookie) > 0 then begin
870		- // zXgª2chÌêCÅèÌNbL[ðHí¹é
871		- Cookie := Cookie + GikoSys.Setting.FixedCookie + '; ';
872		- end;
873		- if (GikoSys.Setting.BeLogin) then begin
874		- Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
875		- + 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
876		- end;
877		-
878		- end;
879		-
	867	+ if (Board.Is2ch) and (GikoSys.Setting.BeLogin) then
	868	+ Cookie := Cookie + 'MDMD=' + GikoSys.Setting.BeCode + '; '
	869	+ + 'DMDM=' + GikoSys.Setting.BeUserID + '; ';
880	870	Cookie := 'Cookie: ' + Cookie + 'NAME=' + NameComboBox.Text + '; MAIL=' + MailComboBox.Text;
881	871
882	872	sysMenu := GetSystemMenu( Handle, false );

		@@ -957,35 +947,35 @@ begin
957	947
958	948	if ABoard = nil then Exit;
959	949
960		- if FileExists(ABoard.GetSETTINGTXTFileName) then begin
961		- body := TStringList.Create;
962		- try
963		- body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
964		- Remote := GetFusianaName(body, ABoard);
965		- finally
966		- body.Free;
967		- end;
968		- end;
969		-
970		- //Setting.txtªÈ©Á½çæ¾
971		- //IÉ×ª©©è»¤...
972		- if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
973		- //GetSETTINGTXTActionðÄÑo·ÆIndyªú»³êéÌÅA
974		- //±±ÅCookieðÛ¶µÈÄÍ¢¯È¢
975		- tmpRawheader := Indy.Response.RawHeaders.Text;
976		- GetSETTINGTXTAction.Execute;
977		- body := TStringList.Create;
978		- try
979		- if FileExists(ABoard.GetSETTINGTXTFileName) then begin
980		- body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
981		- Remote := GetFusianaName(body, ABoard);
982		- end;
983		- finally
984		- body.Free;
985		- end;
	950	+ if FileExists(ABoard.GetSETTINGTXTFileName) then begin
	951	+ body := TStringList.Create;
	952	+ try
	953	+ body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
	954	+ Remote := GetFusianaName(body, ABoard);
	955	+ finally
	956	+ body.Free;
	957	+ end;
	958	+ end;
	959	+
	960	+ //Setting.txtªÈ©Á½çæ¾
	961	+ //IÉ×ª©©è»¤Å\|¢EEE
	962	+ if not FileExists(ABoard.GetSETTINGTXTFileName) then begin
	963	+ //GetSETTINGTXTActionðÄÑo·ÆIndyªú»³êéÌÅA
	964	+ //±±ÅCookieðÛ¶µÈÄÍ¢¯È¢
	965	+ tmpRawheader := Indy.Response.RawHeaders.Text;
	966	+ GetSETTINGTXTAction.Execute;
	967	+ body := TStringList.Create;
	968	+ try
	969	+ if FileExists(ABoard.GetSETTINGTXTFileName) then begin
	970	+ body.LoadFromFile(ABoard.GetSETTINGTXTFileName);
	971	+ Remote := GetFusianaName(body, ABoard);
	972	+ end;
	973	+ finally
	974	+ body.Free;
	975	+ end;
986	976	end;
987	977
988		- if Remote = 'fusianasan' then begin
	978	+ if Remote = 'fusianasan' then begin
989	979	MsgResult := MsgBox(
990	980	Handle,
991	981	'[gzXgð\¦·é@\ªgíêÄ¢Ü·' + #13#10 +

		@@ -1001,83 +991,83 @@ begin
1001	991	DrawMenuBar(Handle);
1002	992	Exit;
1003	993	end;
1004		- end;
1005		- end;
1006		-
1007		- if ResultType = grtOK then begin
1008		- if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
1009		- WriteSambaTime(FHost, Now());
1010		- State := gdsComplete;
1011		- end else if ResultType = grtCookie then begin
1012		- //[vh~
1013		- if not FirstWriting then
1014		- raise Exception.Create('');
1015		- MsgResult := MsgBox(
1016		- Handle,
1017		- 'Ee³ê½àeÍRs[AÛ¶AøpA]Ú³êéêª èÜ·B' + #13#10 +
1018		- 'EeÉÖµÄ¶·éÓCÍSÄeÒÉAµÜ·B' + #13#10#13#10 +
1019		- 'SÓCð¤±Æð³øµÄ«ÝÜ·©H',
1020		- 'îñ',
1021		- MB_YESNO or MB_ICONQUESTION);
1022		- if MsgResult = IDYES then begin
1023		- if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
1024		- GetCookie(tmpRawheader, Board);
1025		- end else begin
1026		- GetCookie(Indy.Response.RawHeaders.Text, Board);
1027		- end;
1028		- if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
1029		- raise Exception.Create('');
1030		- //à¤êñ±Ì\bh
1031		- Send(Board.Cookie, Board.SPID, Board.PON, False);
1032		- Exit;
1033		- end else begin
1034		- Board.SPID := '';
1035		- Board.PON := '';
1036		- FWork := False;
1037		- EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
1038		- DrawMenuBar(Handle);
1039		- Exit;
1040		- end;
1041		- end else if ResultType = grtCheck then begin
1042		- //[vh~
1043		- if not FirstWriting then
1044		- raise Exception.Create('');
	994	+ end;
	995	+ end;
1045	996
1046		- MsgResult := MsgBox(
1047		- Handle,
1048		- '«ÝÉÖµÄÍlXÈOîñªL^³êÄ¢Ü·B' + #13#10 +
1049		- 'eÉÖµÄ¶·éÓCÍSÄeÒÉAµÜ·B' + #13#10 +
1050		- 'öÇÉ½µ½èA¼lÉÀfð©¯é«ÝÍT¦Äº³¢B' + #13#10 +
1051		- 'e³ê½àeÍRs[EÛ¶EøpE]Ú³êéêª èÜ·B' + #13#10 +
1052		- #13#10 +
1053		- 'SÓCð¤±Æð³øµÄ«ÝÜ·©H',
1054		- 'mF',
1055		- MB_YESNO or MB_ICONQUESTION);
1056		-
1057		- if MsgResult = IDYES then begin
1058		- if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
1059		- GetCookie(tmpRawheader, Board);
	997	+ if ResultType = grtOK then begin
	998	+ if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
	999	+ WriteSambaTime(FHost, Now());
	1000	+ State := gdsComplete;
	1001	+ end else if ResultType = grtCookie then begin
	1002	+ //[vh~
	1003	+ if not FirstWriting then
	1004	+ raise Exception.Create('');
	1005	+ MsgResult := MsgBox(
	1006	+ Handle,
	1007	+ 'Ee³ê½àeÍRs[AÛ¶AøpA]Ú³êéêª èÜ·B' + #13#10 +
	1008	+ 'EeÉÖµÄ¶·éÓCÍSÄeÒÉAµÜ·B' + #13#10#13#10 +
	1009	+ 'SÓCð¤±Æð³øµÄ«ÝÜ·©H',
	1010	+ 'îñ',
	1011	+ MB_YESNO or MB_ICONQUESTION);
	1012	+ if MsgResult = IDYES then begin
	1013	+ if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
	1014	+ GetCookie(tmpRawheader, Board);
1060	1015	end else begin
1061	1016	GetCookie(Indy.Response.RawHeaders.Text, Board);
1062		- end;
1063		-
1064		- if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
1065		- raise Exception.Create('');
1066		- Send(Board.Cookie, Board.SPID, Board.PON, False);
1067		- Exit;
1068		- end else begin
1069		- EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
1070		- DrawMenuBar(Handle);
1071		- Board.SPID := '';
1072		- Board.PON := '';
1073		- FWork := false;
1074		- Exit;
	1017	+ end;
	1018	+ if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
	1019	+ raise Exception.Create('');
	1020	+ //à¤êñ±Ì\bh
	1021	+ Send(Board.Cookie, Board.SPID, Board.PON, False);
	1022	+ Exit;
	1023	+ end else begin
	1024	+ Board.SPID := '';
	1025	+ Board.PON := '';
	1026	+ FWork := false;
	1027	+ EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
	1028	+ DrawMenuBar(Handle);
	1029	+ Exit;
	1030	+ end;
	1031	+ end else if ResultType = grtCheck then begin
	1032	+ //
	1033	+ //[vh~
	1034	+ if not FirstWriting then
	1035	+ raise Exception.Create('');
	1036	+
	1037	+ MsgResult := MsgBox(
	1038	+ Handle,
	1039	+ '«ÝÉÖµÄÍlXÈOîñªL^³êÄ¢Ü·B' + #13#10 +
	1040	+ 'eÉÖµÄ¶·éÓCÍSÄeÒÉAµÜ·B' + #13#10 +
	1041	+ 'öÇÉ½µ½èA¼lÉÀfð©¯é«ÝÍT¦Äº³¢B' + #13#10 +
	1042	+ 'e³ê½àeÍRs[EÛ¶EøpE]Ú³êéêª èÜ·B' + #13#10 +
	1043	+ #13#10 +
	1044	+ 'SÓCð¤±Æð³øµÄ«ÝÜ·©H',
	1045	+ 'mF',
	1046	+ MB_YESNO or MB_ICONQUESTION);
	1047	+
	1048	+ if MsgResult = IDYES then begin
	1049	+ if (GikoSys.Setting.RemoteTrapAtt) and (tmpRawheader <> '') then begin
	1050	+ GetCookie(tmpRawheader, Board);
	1051	+ end else begin
	1052	+ GetCookie(Indy.Response.RawHeaders.Text, Board);
	1053	+ end;
	1054	+ if (Board.SPID = '') and (Board.PON = '') and (Board.Cookie = '') then
	1055	+ raise Exception.Create('');
	1056	+ Send(Board.Cookie, Board.SPID, Board.PON, False);
	1057	+ Exit;
	1058	+ end else begin
	1059	+ EnableMenuItem(SysMenu, SC_CLOSE, MF_BYCOMMAND or MF_ENABLED);
	1060	+ DrawMenuBar(Handle);
	1061	+ Board.SPID := '';
	1062	+ Board.PON := '';
	1063	+ FWork := false;
	1064	+ Exit;
1075	1065	end;
1076	1066	end else begin
1077		- if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
1078		- WriteSambaTime(FHost, Now());
1079		- State := gdsError;
1080		- raise Exception.Create('');
	1067	+ if (GikoSys.Setting.UseSamba) and (Timer1.Enabled) then
	1068	+ WriteSambaTime(FHost, Now());
	1069	+ State := gdsError;
	1070	+ raise Exception.Create('');
1081	1071	end;
1082	1072
1083	1073	except

		@@ -1120,9 +1110,8 @@ begin
1120	1110	DrawMenuBar(Handle);
1121	1111	end;
1122	1112	FWork := false;
1123		- //ñö®MRirÂÈÇÌ2chÝ·XNvgp
1124		- //2chÈOÅ©ÂResponceCodeª302FoundÅ«Ý®¹
1125		- //if (not Board.Is2ch) and (FStatusCode = 302) then begin
	1113	+ //ñö®MRirÂÈÇÌXNvgp
	1114	+ //ResponceCodeª302FoundÅ«Ý®¹
1126	1115	if FStatusCode = 302 then begin
1127	1116	GikoForm.PlaySound('ResEnd');
1128	1117	SaveSendFile;

		@@ -1213,13 +1202,12 @@ begin
1213	1202	s := 'sid=' + HttpEncode(SessionID) + '&'
1214	1203	else
1215	1204	s := '';
1216		- s := s + 'subject=&'
1217		- + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
1218		- + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
1219		- + 'MESSAGE=' + HttpEncode(body) + '&'
1220		- + 'bbs=' + Board.BBSID + '&'
1221		- + 'time=' + IntToStr(SendTime) + '&';
1222		-
	1205	+ s := s + 'subject=&'
	1206	+ + 'FROM=' + HttpEncode(NameComboBox.Text) + '&'
	1207	+ + 'mail=' + HttpEncode(MailComboBox.Text) + '&'
	1208	+ + 'MESSAGE=' + HttpEncode(body) + '&'
	1209	+ + 'bbs=' + Board.BBSID + '&'
	1210	+ + 'time=' + IntToStr(SendTime) + '&';
1223	1211	if FThreadItem = nil then begin
1224	1212	s := s + 'subject=' + HttpEncode(TitleEdit.Text) + '&';
1225	1213	s := s + 'submit=' + HttpEncode('SÓCð¤±Æð³øµÄ«Þ') + #13#10;

		@@ -2182,7 +2170,7 @@ begin
2182	2170	end else if( AnsiPos(VAL_PON, val) > 0 ) then begin
2183	2171	ABoard.PON := Copy(val, AnsiPos(VAL_PON, val) + Length(VAL_PON), Length(val));
2184	2172	end else begin
2185		- ABoard.Cookie := ABoard.Cookie + val + '; ';
	2173	+ ABoard.Cookie := val + '; ';
2186	2174	end;
2187	2175	//expiresðØèo·
2188	2176	val := Trim(GikoSys.GetTokenIndex(tmp, ';', 1));

--- a/Giko.dfm

+++ b/Giko.dfm

		@@ -4469,7 +4469,7 @@ object GikoForm: TGikoForm
4469	4469	Left = 4
4470	4470	Top = 244
4471	4471	Bitmap = {
4472		- 494C010138003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
	4472	+ 494C010138003B00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
4473	4473	000000000000360000002800000040000000F0000000010020000000000000F0
4474	4474	0000000000000000000000000000000000000000000000000000000000000000
4475	4475	0000000000000000000000000000000000000000000000000000000000000000

		@@ -6453,8 +6453,7 @@ object GikoForm: TGikoForm
6453	6453	00000000C003FFFF0000000080017FFF0000000080013F7F0000000000000E3F
6454	6454	000000000000861F800000000000C20FC00100000000E007F81F00000000F043
6455	6455	F00F00000000F861E00700008001FC70C003803F8001FEFCF81FC07FC003FFFE
6456		- F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
6457		- 000000000000}
	6456	+ F81FE0FFE007FFFFF83FFFFFF81FFFFF}
6458	6457	end
6459	6458	object ItemImageList: TImageList
6460	6459	Left = 4

		@@ -7886,12 +7885,10 @@ object GikoForm: TGikoForm
7886	7885	end
7887	7886	object N76: TMenuItem
7888	7887	Action = GikoDM.LiveItemAction
7889		- AutoCheck = True
7890	7888	GroupIndex = 1
7891	7889	end
7892	7890	object DAT3: TMenuItem
7893	7891	Action = GikoDM.ArchiveItemAction
7894		- AutoCheck = True
7895	7892	GroupIndex = 1
7896	7893	end
7897	7894	object S2: TMenuItem

		@@ -8649,9 +8646,6 @@ object GikoForm: TGikoForm
8649	8646	object N58: TMenuItem
8650	8647	Caption = '-'
8651	8648	end
8652		- object FavoriteTreeItemNameCopyPopupMenu: TMenuItem
8653		- Action = GikoDM.FavoriteTreeViewItemNameCopyAction
8654		- end
8655	8649	object FavoriteTreeURLCopyPopupMenu: TMenuItem
8656	8650	Action = GikoDM.FavoriteTreeViewURLCopyAction
8657	8651	end

		@@ -8728,11 +8722,9 @@ object GikoForm: TGikoForm
8728	8722	end
8729	8723	object N75: TMenuItem
8730	8724	Action = GikoDM.LiveItemAction
8731		- AutoCheck = True
8732	8725	end
8733	8726	object DAT2: TMenuItem
8734	8727	Action = GikoDM.ArchiveItemAction
8735		- AutoCheck = True
8736	8728	end
8737	8729	object N68: TMenuItem
8738	8730	Caption = '-'

--- a/Giko.pas

+++ b/Giko.pas

		@@ -408,7 +408,6 @@ type
408	408	N75: TMenuItem;
409	409	DAT3: TMenuItem;
410	410	N76: TMenuItem;
411		- FavoriteTreeItemNameCopyPopupMenu: TMenuItem;
412	411	procedure FormCreate(Sender: TObject);
413	412	procedure FormDestroy(Sender: TObject);
414	413	procedure BrowserStatusTextChange(Sender: TObject;

		@@ -1912,8 +1911,8 @@ begin
1912	1911	tmp2 := ZenToHan(e.Get_outerText);
1913	1912	if (GikoSys.IsNumeric(tmp2)) then begin
1914	1913	//ÍXÔÁÛ¢Á·B
1915		- wkIntSt := StrToInt64(tmp2);
1916		- wkIntTo := StrToInt64(tmp2);
	1914	+ wkIntSt := StrToInt(tmp2);
	1915	+ wkIntTo := StrToInt(tmp2);
1917	1916	//s := GetThreadText(wkBBS, wkKey, wkIntSt, wkIntTo, False, False);
1918	1917	FHint.PopupType := gptThread;
1919	1918	HTMLCreater.SetResPopupText(FHint, GetActiveContent, wkIntSt, wkIntTo, False, False);

		@@ -4623,7 +4622,7 @@ begin
4623	4622	threadNumber := ChangeFileExt(Thread.FileName, '');
4624	4623	GikoSys.GetPopupResNumber( URL, stRes, edRes );
4625	4624	// XÌÔðXÔÆëÁÄF¯µÄ¢éÌðNA
4626		- if (StrToInt64(threadNumber) = stRes) then begin
	4625	+ if (StrToInt(threadNumber) = stRes) then begin
4627	4626	if not (AnsiEndsText(threadNumber + '/' + threadNumber, URL))
4628	4627	and (Pos('&st=' + threadNumber , URL) = 0) then begin
4629	4628	stRes := 0;

		@@ -4781,8 +4780,8 @@ begin
4781	4780	ListView.Items.Count := ListView.Items.Count + 1;
4782	4781	end;
4783	4782	end;
4784		- // OÈµXbhÌÆ«ÍAzXg¼Ì`FbNð·é
4785		- if (not ThreadItem.IsLogFile) then begin
	4783	+ // 2¿áñËéÅÈOÈµXbhÌÆ«ÍAzXg¼Ì`FbNð·é
	4784	+ if (not Board.Is2ch) and (not ThreadItem.IsLogFile) then begin
4786	4785	if AnsiPos(Host, Board.URL) = 0 then
4787	4786	ThreadItem.DownloadHost := Host
4788	4787	else

		@@ -5099,7 +5098,7 @@ begin
5099	5098
5100	5099	ThreadItem := GetActiveContent;
5101	5100	if ThreadItem <> nil then begin
5102		- Num := StrToInt64(s);
	5101	+ Num := StrToInt(s);
5103	5102	FHint.PopupType := gptThread;
5104	5103	HTMLCreater.SetResPopupText(FHint, ThreadItem, Num, Num, False, False);
5105	5104	if FHint.ResCount <> 0 then

		@@ -6238,29 +6237,26 @@ begin
6238	6237	FavoriteTreeNameURLCopyPopupMenu.Visible := False;
6239	6238	FavoriteTreeReloadPopupMenu.Visible := False;
6240	6239	FavoriteTreeLogDeletePopupMenu.Visible := False;
6241		- FavoriteTreeItemNameCopyPopupMenu.Visible := False;
6242	6240	end else if FClickNode.IsFirstNode then begin
6243	6241	FavoriteTreeBrowseFolderPopupMenu.Visible := True;
6244	6242	FavoriteTreeDeletePopupMenu.Visible := False;
6245	6243	FavoriteTreeRenamePopupMenu.Visible := False;
6246	6244	FavoriteTreeNewFolderPopupMenu.Visible := True;
6247	6245	FavoriteTreeURLCopyPopupMenu.Visible := False;
6248		- FavoriteTreeNameCopyPopupMenu.Visible := False;
	6246	+ FavoriteTreeNameCopyPopupMenu.Visible := True;
6249	6247	FavoriteTreeNameURLCopyPopupMenu.Visible := False;
6250	6248	FavoriteTreeReloadPopupMenu.Visible := False;
6251	6249	FavoriteTreeLogDeletePopupMenu.Visible := False;
6252		- FavoriteTreeItemNameCopyPopupMenu.Visible := True;
6253	6250	end else if FClickNode.Text = Favorite.FAVORITE_LINK_NAME then begin
6254	6251	FavoriteTreeBrowseFolderPopupMenu.Visible := True;
6255	6252	FavoriteTreeDeletePopupMenu.Visible := True;
6256	6253	FavoriteTreeRenamePopupMenu.Visible := False;
6257	6254	FavoriteTreeNewFolderPopupMenu.Visible := True;
6258	6255	FavoriteTreeURLCopyPopupMenu.Visible := False;
6259		- FavoriteTreeNameCopyPopupMenu.Visible := False;
	6256	+ FavoriteTreeNameCopyPopupMenu.Visible := True;
6260	6257	FavoriteTreeNameURLCopyPopupMenu.Visible := False;
6261	6258	FavoriteTreeReloadPopupMenu.Visible := False;
6262	6259	FavoriteTreeLogDeletePopupMenu.Visible := False;
6263		- FavoriteTreeItemNameCopyPopupMenu.Visible := True;
6264	6260	end else if TObject(FClickNode.Data) is TFavoriteFolder then begin
6265	6261	FavoriteTreeBrowseFolderPopupMenu.Visible := True;
6266	6262	FavoriteTreeDeletePopupMenu.Visible := True;

		@@ -6271,7 +6267,6 @@ begin
6271	6267	FavoriteTreeNameURLCopyPopupMenu.Visible := False;
6272	6268	FavoriteTreeReloadPopupMenu.Visible := False;
6273	6269	FavoriteTreeLogDeletePopupMenu.Visible := False;
6274		- FavoriteTreeItemNameCopyPopupMenu.Visible := True;
6275	6270	end else if TObject(FClickNode.Data) is TFavoriteThreadItem then begin
6276	6271	FavoriteTreeBrowseFolderPopupMenu.Visible := False;
6277	6272	FavoriteTreeDeletePopupMenu.Visible := True;

		@@ -6282,7 +6277,6 @@ begin
6282	6277	FavoriteTreeNameURLCopyPopupMenu.Visible := True;
6283	6278	FavoriteTreeReloadPopupMenu.Visible := True;
6284	6279	FavoriteTreeLogDeletePopupMenu.Visible := True;
6285		- FavoriteTreeItemNameCopyPopupMenu.Visible := True;
6286	6280	end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin
6287	6281	FavoriteTreeBrowseFolderPopupMenu.Visible := False;
6288	6282	FavoriteTreeDeletePopupMenu.Visible := True;

		@@ -6293,7 +6287,6 @@ begin
6293	6287	FavoriteTreeNameURLCopyPopupMenu.Visible := True;
6294	6288	FavoriteTreeReloadPopupMenu.Visible := True;
6295	6289	FavoriteTreeLogDeletePopupMenu.Visible := False;
6296		- FavoriteTreeItemNameCopyPopupMenu.Visible := True;
6297	6290	end else begin
6298	6291	FavoriteTreeBrowseFolderPopupMenu.Visible := False;
6299	6292	FavoriteTreeDeletePopupMenu.Visible := False;

		@@ -6304,7 +6297,6 @@ begin
6304	6297	FavoriteTreeNameURLCopyPopupMenu.Visible := False;
6305	6298	FavoriteTreeReloadPopupMenu.Visible := False;
6306	6299	FavoriteTreeLogDeletePopupMenu.Visible := False;
6307		- FavoriteTreeItemNameCopyPopupMenu.Visible := False;
6308	6300	end;
6309	6301
6310	6302	end;

--- a/GikoDataModule.dfm

+++ b/GikoDataModule.dfm

		@@ -913,7 +913,7 @@ object GikoDM: TGikoDM
913	913	object FavoriteTreeViewURLCopyAction: TAction
914	914	Tag = -1
915	915	Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
916		- Caption = 'URL'#12434#12467#12500#12540'(&U)'
	916	+ Caption = 'URL'#12434#12467#12500#12540'(&C)'
917	917	Hint = #36984#25246#12373#12428#12390#12356#12427#12473#12524#12483#12489#12398'URL'#12434#12467#12500#12540#12377#12427
918	918	OnExecute = FavoriteTreeViewURLCopyActionExecute
919	919	end

		@@ -1234,12 +1234,6 @@ object GikoDM: TGikoDM
1234	1234	ShortCut = 16454
1235	1235	OnExecute = OpenFindDialogActionExecute
1236	1236	end
1237		- object FavoriteTreeViewItemNameCopyAction: TAction
1238		- Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
1239		- Caption = #34920#31034#21517#12434#12467#12500#12540'(&S)'
1240		- Hint = #34920#31034#12375#12390#12356#12427#21517#21069#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
1241		- OnExecute = FavoriteTreeViewItemNameCopyActionExecute
1242		- end
1243	1237	end
1244	1238	object ToobarImageList: TImageList
1245	1239	Left = 44

--- a/GikoDataModule.pas

+++ b/GikoDataModule.pas

		@@ -217,7 +217,6 @@ type
217	217	OpenFindDialogAction: TAction;
218	218	ArchiveItemAction: TAction;
219	219	LiveItemAction: TAction;
220		- FavoriteTreeViewItemNameCopyAction: TAction;
221	220	procedure EditNGActionExecute(Sender: TObject);
222	221	procedure ReloadActionExecute(Sender: TObject);
223	222	procedure GoFowardActionExecute(Sender: TObject);

		@@ -404,7 +403,6 @@ type
404	403	procedure OpenFindDialogActionExecute(Sender: TObject);
405	404	procedure ArchiveItemActionExecute(Sender: TObject);
406	405	procedure LiveItemActionExecute(Sender: TObject);
407		- procedure FavoriteTreeViewItemNameCopyActionExecute(Sender: TObject);
408	406	private
409	407	{ Private é¾ }
410	408	procedure ClearResFilter;

		@@ -726,7 +724,7 @@ begin
726	724
727	725	end;
728	726	// *************************************************************************
729		-//! Ið³êÄ¢é¨CÉüèÌURLðRs[·é
	727	+//! Ið³êÄ¢éXbhÌURLðRs[·é
730	728	// *************************************************************************
731	729	procedure TGikoDM.FavoriteTreeViewURLCopyActionExecute(Sender: TObject);
732	730	begin

		@@ -738,7 +736,7 @@ begin
738	736	end;
739	737	end;
740	738	// *************************************************************************
741		-//! Ið³êÄ¢é¨CÉüèÌ¼OðRs[·é
	739	+//! Ið³êÄ¢éÂÌ¼OðRs[·é
742	740	// *************************************************************************
743	741	procedure TGikoDM.FavoriteTreeViewNameCopyActionExecute(Sender: TObject);
744	742	begin

		@@ -748,14 +746,10 @@ begin
748	746	if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
749	747	Clipboard.AsText :=
750	748	TFavoriteItem(GikoForm.ClickNode.Data).GetItemTitle + #13#10;
751		- end else begin
752		- Clipboard.AsText :=
753		- GikoForm.ClickNode.Text + #13#10;
754		-
755	749	end;
756	750	end;
757	751	// *************************************************************************
758		-//! Ið³êÄ¢é¨CÉüèÌ¼OÆURLðRs[·é
	752	+//! Ið³êÄ¢éXbhÌ¼OÆURLðRs[·é
759	753	// *************************************************************************
760	754	procedure TGikoDM.FavoriteTreeViewNameURLCopyActionExecute(
761	755	Sender: TObject);

		@@ -773,7 +767,7 @@ begin
773	767
774	768	end;
775	769	// *************************************************************************
776		-//! Ið³êÄ¢é¨CÉüèXbhðí·é
	770	+//! Ið³êÄ¢éXbhðí·é
777	771	// *************************************************************************
778	772	procedure TGikoDM.FavoriteTreeViewLogDeleteActionExecute(Sender: TObject);
779	773	const

		@@ -3865,17 +3859,6 @@ begin
3865	3859	end;
3866	3860	end;
3867	3861
3868		-// *************************************************************************
3869		-//! Ið³êÄ¢é¨CÉüèÌ\¦¼ðRs[·é
3870		-// *************************************************************************
3871		-procedure TGikoDM.FavoriteTreeViewItemNameCopyActionExecute(
3872		- Sender: TObject);
3873		-begin
3874		- if GikoForm.ClickNode = nil then Exit;
3875		-
3876		- Clipboard.AsText :=
3877		- GikoForm.ClickNode.Text + #13#10;
3878		-end;
3879	3862
3880	3863	end.
3881	3864

--- a/InputAssist.pas

+++ b/InputAssist.pas

		@@ -72,7 +72,7 @@ var
72	72
73	73	implementation
74	74
75		-uses Setting, MojuUtils;
	75	+uses Setting;
76	76
77	77
78	78	{$R *.dfm}

		@@ -194,19 +194,15 @@ procedure TInputAssistForm.GikoListView1Compare(Sender: TObject; Item1,
194	194	begin
195	195	if ((FSortColumn and 2) > 0) then begin
196	196	// JeSÅ\[g
197		- Compare := CompareStr(
198		- ZenToHan(Item1.SubItems[0]), ZenToHan(Item2.SubItems[0]));
	197	+ Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
199	198	if (Compare = 0) then begin
200		- Compare := CompareStr(
201		- ZenToHan(Item1.Caption), ZenToHan(Item2.Caption));
	199	+ Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
202	200	end;
203	201	end else begin
204	202	// L[Å\[g
205		- Compare := CompareStr(
206		- ZenToHan(Item1.Caption), ZenToHan(Item2.Caption));
	203	+ Compare := AnsiCompareStr(Item1.Caption, Item2.Caption);
207	204	if (Compare = 0) then begin
208		- Compare := CompareStr(
209		- ZenToHan(Item1.SubItems[0]), ZenToHan(Item2.SubItems[0]));
	205	+ Compare := AnsiCompareStr(Item1.SubItems[0], Item2.SubItems[0]);
210	206	end;
211	207	end;
212	208	// ¸~Ì½]

--- a/InputAssistDataModule.pas

+++ b/InputAssistDataModule.pas

		@@ -3,7 +3,7 @@ unit InputAssistDataModule;
3	3	interface
4	4
5	5	uses
6		- SysUtils, Classes, Windows;
	6	+ SysUtils, Classes;
7	7
8	8	type
9	9	TResistWord = class;

		@@ -15,7 +15,6 @@ type
15	15	{ Private é¾ }
16	16	FInit : Boolean;
17	17	FDictionary : TStringList; ///< o^PêÆè^¶Ì«
18		- FSorted : Boolean;
19	18	function GetSorted: Boolean; ///< \[gÌóÔÌæ¾
20	19	procedure SetSorted(Value: Boolean); ///< \[góÔÌÝè
21	20

		@@ -58,7 +57,6 @@ type
58	57	end;
59	58
60	59	function CategorySort(List: TStringList; Index1, Index2: Integer): Integer;
61		- function KeySort(List: TStringList; Index1, Index2: Integer): Integer;
62	60	var
63	61	InputAssistDM: TInputAssistDM;
64	62

		@@ -120,9 +118,7 @@ begin
120	118	try
121	119	// init@Cª³¯êÎAftHgðl[·é
122	120	if not FileExists(FilePath) then begin
123		- CopyFile(
124		- PChar(ChangeFileExt(FilePath, '.default')),
125		- PChar(FilePath), True);
	121	+ RenameFile(ChangeFileExt(FilePath, '.default'), FilePath);
126	122	end;
127	123
128	124	// t@CÌ¶ÝðmF

		@@ -149,9 +145,6 @@ begin
149	145	sections.Free;
150	146	ini.Free;
151	147	end;
152		- if FSorted Then begin
153		- FDictionary.CustomSort(KeySort);
154		- end;
155	148	end;
156	149
157	150	except

		@@ -167,11 +160,10 @@ var
167	160	begin
168	161	if FileExists(FilePath) then begin
169	162	try
170		- SysUtils.DeleteFile(FilePath);
	163	+ DeleteFile(FilePath);
171	164	except
172	165	end;
173	166	end;
174		-
175	167	ini := TMemIniFile.Create(FilePath);
176	168	try
177	169	for i :=0 to FDictionary.Count - 1 do begin

		@@ -201,8 +193,8 @@ end;
201	193	procedure TInputAssistDM.DataModuleCreate(Sender: TObject);
202	194	begin
203	195	FDictionary := TStringList.Create;
204		- FDictionary.Sorted := False;
205		- FSorted := True;
	196	+ FDictionary.Duplicates := dupAccept;
	197	+ FDictionary.Sorted := True;
206	198	end;
207	199	//! o^Pêæ¾
208	200	function TInputAssistDM.ResistWordCount : Integer;

		@@ -235,9 +227,6 @@ begin
235	227	break;
236	228	end;
237	229	end;
238		- if FSorted Then begin
239		- FDictionary.CustomSort(KeySort);
240		- end;
241	230	end;
242	231	end;
243	232	//! o^PêÇÁ

		@@ -253,9 +242,6 @@ begin
253	242	resWord.SetText('è^¶');
254	243	FDictionary.AddObject(Key, resWord);
255	244	Result := resWord;
256		- if FSorted Then begin
257		- FDictionary.CustomSort(KeySort);
258		- end;
259	245	end;
260	246	end;
261	247	//! o^PêÌL[ÏX

		@@ -270,10 +256,6 @@ begin
270	256	break;
271	257	end;
272	258	end;
273		- if FSorted Then begin
274		- FDictionary.CustomSort(KeySort);
275		- end;
276		-
277	259	end;
278	260	end;
279	261	//! KeyðÂo^³êÄ¢éPêðæ¾

		@@ -323,15 +305,17 @@ end;
323	305	//! \[gÌóÔÌæ¾
324	306	function TInputAssistDM.GetSorted: Boolean;
325	307	begin
326		- Result := FSorted;
	308	+ Result := False;
	309	+ if (FDictionary <> nil) then begin
	310	+ Result := FDictionary.Sorted;
	311	+ end;
327	312	end;
328	313	//! \[góÔÌÝè
329	314	procedure TInputAssistDM.SetSorted(Value: Boolean);
330	315	begin
331		- if (not FSorted) and (Value) then begin
332		- FDictionary.CustomSort(KeySort);
	316	+ if (FDictionary <> nil) then begin
	317	+ FDictionary.Sorted := Value;
333	318	end;
334		- FSorted := Value;
335	319	end;
336	320	//! KeyÌJeSÉo^³êÄ¢éPêðæ¾
337	321	function TInputAssistDM.GetCategoryResistWords(Key: String; var list: TStringList): Integer;

		@@ -381,30 +365,9 @@ begin
381	365	try
382	366	resWord1 := TResistWord(List.Objects[Index1]);
383	367	resWord2 := TResistWord(List.Objects[Index2]);
384		- Result := CompareStr(ZenToHan(resWord1.GetCategory),
385		- ZenToHan(resWord2.GetCategory));
386		- if (Result = 0) then begin
387		- Result := CompareStr(ZenToHan(resWord1.GetKey),
388		- ZenToHan(resWord2.GetKey));
389		- end;
390		- except
391		- end;
392		-end;
393		-//! KeyðS¼p³Ì`Å\[g·éÛÌär\bh
394		-function KeySort(List: TStringList; Index1, Index2: Integer): Integer;
395		-var
396		- resWord1 : TResistWord;
397		- resWord2 : TResistWord;
398		-begin
399		- Result := 0;
400		- try
401		- resWord1 := TResistWord(List.Objects[Index1]);
402		- resWord2 := TResistWord(List.Objects[Index2]);
403		- Result := CompareStr(ZenToHan(resWord1.FKey),
404		- ZenToHan(resWord2.FKey));
	368	+ Result := AnsiCompareStr(resWord1.GetCategory, resWord2.GetCategory);
405	369	if (Result = 0) then begin
406		- Result := CompareStr(ZenToHan(resWord1.GetCategory),
407		- ZenToHan(resWord2.GetCategory));
	370	+ Result := AnsiCompareStr(resWord1.GetKey, resWord2.GetKey);
408	371	end;
409	372	except
410	373	end;

--- a/KuroutSetting.dfm

+++ b/KuroutSetting.dfm

		@@ -363,39 +363,6 @@ object KuroutOption: TKuroutOption
363	363	end
364	364	end
365	365	end
366		- object KakikomiTabSheet: TTabSheet
367		- Caption = #35443#32048#35373#23450'3'
368		- ImageIndex = 2
369		- object CookieGroupBox: TGroupBox
370		- Left = 16
371		- Top = 16
372		- Width = 473
373		- Height = 105
374		- Caption = #12463#12483#12461#12540
375		- TabOrder = 0
376		- object Label8: TLabel
377		- Left = 16
378		- Top = 20
379		- Width = 59
380		- Height = 12
381		- Caption = #22266#23450'Cookie'
382		- end
383		- object Label9: TLabel
384		- Left = 20
385		- Top = 67
386		- Width = 321
387		- Height = 12
388		- Caption = '2'#12385#12419#12435#12397#12427#12408#12398#26360#12365#36796#12415#12398#38555#12395#65380#19978#35352#12398#25991#23383#21015#12434#24120#12395#36865#20449#12377#12427
389		- end
390		- object FixedCookieEdit: TEdit
391		- Left = 16
392		- Top = 40
393		- Width = 441
394		- Height = 20
395		- TabOrder = 0
396		- end
397		- end
398		- end
399	366	end
400	367	object OkBotton: TButton
401	368	Left = 224

--- a/KuroutSetting.pas

+++ b/KuroutSetting.pas

		@@ -56,11 +56,6 @@ type
56	56	Label6: TLabel;
57	57	ReadTimeOut: TEdit;
58	58	Label7: TLabel;
59		- KakikomiTabSheet: TTabSheet;
60		- CookieGroupBox: TGroupBox;
61		- Label8: TLabel;
62		- FixedCookieEdit: TEdit;
63		- Label9: TLabel;
64	59	procedure OkBottonClick(Sender: TObject);
65	60	procedure FormCreate(Sender: TObject);
66	61	procedure CDeleteButtonClick(Sender: TObject);

		@@ -121,8 +116,6 @@ begin
121	116	//FusianaSet
122	117	LocalTrapAtt.Checked := GikoSys.Setting.LocalTrapAtt;
123	118	RemoteTrapAtt.Checked := GikoSys.Setting.RemoteTrapAtt;
124		- // Cookie
125		- FixedCookieEdit.Text := GikoSys.Setting.FixedCookie;
126	119	end;
127	120
128	121	procedure TKuroutOption.SaveSetting;

		@@ -141,15 +134,12 @@ begin
141	134	else
142	135	GikoSys.Setting.TimeAdjustSec := 0;
143	136	GikoSys.Setting.TimeAdjust := PutPostTimeRadioButton.Checked;
144		- //2ch¾êT\|[g
145		- GikoSys.Setting.GengoSupport := GengoSupport.Checked;
146		- GikoSys.SetGikoMessage;
147		- //[JE[gÌ¼±Åx
148		- GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
149		- GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
150		- // Cookie
151		- GikoSys.Setting.FixedCookie := FixedCookieEdit.Text;
152		-
	137	+ //2ch¾êT\|[g
	138	+ GikoSys.Setting.GengoSupport := GengoSupport.Checked;
	139	+ GikoSys.SetGikoMessage;
	140	+ //[JE[gÌ¼±Åx
	141	+ GikoSys.Setting.LocalTrapAtt := LocalTrapAtt.Checked;
	142	+ GikoSys.Setting.RemoteTrapAtt := RemoteTrapAtt.Checked;
153	143
154	144	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
155	145	end;

--- a/Option.dfm

+++ b/Option.dfm

		@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
61	61	Top = 4
62	62	Width = 509
63	63	Height = 389
64		- ActivePage = TabSheet4
	64	+ ActivePage = TabSheet3
65	65	MultiLine = True
66		- TabIndex = 7
	66	+ TabIndex = 3
67	67	TabOrder = 3
68	68	OnChange = OptionTabChange
69	69	object ConnectSheet: TTabSheet

		@@ -1207,8 +1207,8 @@ object OptionDialog: TOptionDialog
1207	1207	end
1208	1208	end
1209	1209	object GroupBox19: TGroupBox
1210		- Left = 11
1211		- Top = 74
	1210	+ Left = 16
	1211	+ Top = 80
1212	1212	Width = 465
1213	1213	Height = 49
1214	1214	Caption = #23653#27508

--- a/Setting.pas

+++ b/Setting.pas

		@@ -411,7 +411,7 @@ type
411	411	//XiÝÅ¢mè¶àLøÉ·é©
412	412	FUseUndecided: Boolean;
413	413
414		- //Be2ch
	414	+ //Be2ch
415	415	//FØp[UIDEpX[h
416	416	FBeUserID: String;
417	417	FBeCode: String;

		@@ -430,9 +430,6 @@ type
430	430	FInputAssistFormWidth: Integer;
431	431	FInputAssistFormHeight: Integer;
432	432
433		- // CookieÉtÁ·éÅèR[h
434		- FFixedCookie: String;
435		-
436	433	function GetMainCoolSet(Index: Integer): TCoolSet;
437	434	function GetBoardCoolSet(Index: Integer): TCoolSet;
438	435	function GetBrowserCoolSet(Index: Integer): TCoolSet;

		@@ -756,8 +753,6 @@ type
756	753	//! InputAssisttH[ÌTCY
757	754	property InputAssistFormWidth: Integer read FInputAssistFormWidth write FInputAssistFormWidth;
758	755	property InputAssistFormHeight: Integer read FInputAssistFormHeight write FInputAssistFormHeight;
759		- //! CookieÉtÁ·éÅèR[h
760		- property FixedCookie: String read FFixedCookie write FFixedCookie;
761	756
762	757	end;
763	758

		@@ -794,7 +789,7 @@ const
794	789	SPAMFILTER_FILE_NAME = 'SpamFilter.ini';
795	790	LANGUAGE_FILE_NAME = 'language.ini';
796	791	INPUTASSIST_FILE_NAME = 'InputAssist.ini';
797		- FIXED_COOKIE = 'hana=mogera';
	792	+
798	793
799	794
800	795	implementation

		@@ -1378,9 +1373,6 @@ begin
1378	1373	FInputAssistFormWidth := ini.ReadInteger('IAtWindowsSize', 'Width', 400);
1379	1374	FInputAssistFormHeight := ini.ReadInteger('IAtWindowsSize', 'Height', 460);
1380	1375
1381		- // CookieÉtÁ·éÅèR[h
1382		- FFixedCookie := ini.ReadString('Cookie', 'fixedString', FIXED_COOKIE);
1383		-
1384	1376	ini.UpdateFile;
1385	1377	finally
1386	1378	ini.Free;

		@@ -1749,8 +1741,6 @@ begin
1749	1741
1750	1742	//ðÌÅåÛ¶
1751	1743	ini.WriteInteger('Recode', 'Max', FMaxRecordCount);
1752		- // ÅèÌCookie¶ñ
1753		- ini.WriteString('Cookie', 'fixedString', FFixedCookie);
1754	1744
1755	1745	ini.UpdateFile;
1756	1746	finally

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/readme.txt

+++ b/readme/readme.txt

		@@ -50,7 +50,7 @@
50	50	------------------------------
51	51	oOâv]ÍAMRirXbhÅó¯t¯Ä¨èÜ·B
52	52	MRirTCgFhttp://gikonavi.sourceforge.jp/
53		-MRirXFhttp://pc7.2ch.net/test/read.cgi/software/1148818605/l50
	53	+MRirXFhttp://pc8.2ch.net/test/read.cgi/software/1121516093/l50
54	54
55	55	------------------------------
56	56	]ÚÉÂ¢Ä

		@@ -113,7 +113,6 @@ LICENSE
113	113	@XbhêÉh¨¢hJÇÁiftHgñ\¦j
114	114	@¨CÉüèAðAMOÌXbh^Cg¼ðTj^CY·éæ¤ÉC³
115	115	im[gÌë½âèÖÌªIÎj
116		-@Q¿áñËéÌCookieÌdlÏXÉÎ
117	116
118	117	2006/01/14
119	118	Version ÊÞÀ51

--- a/res/skin/skin30-2G/Header.html

+++ b/res/skin/skin30-2G/Header.html

		@@ -16,7 +16,7 @@
16	16	var start_time = new Date();
17	17	//==========O[oÏ
18	18	var anchorHead="";
19		-var skinName="skin30-2 v3.6.1231";
	19	+var skinName="skin30-2 v3.5.0704";
20	20	var browser="MRir";
21	21	//==========MRirpAJ[Ì»èi0:³µ,1:\|bvAbv,2:{^}üj
22	22	// MRirÅÍAXAJ[ÍÎAhXÅLq³êé

		@@ -48,16 +48,6 @@ function threadurl(){
48	48	t_bbs=RegExp.$1;
49	49	t_key=RegExp.$2;
50	50	}
51		-//==========ñ\¦XÌ\¦-MRirÌÝ
52		-function hiddenRes(e){
53		- var number=tohan(event.srcElement.innerText.replace(/>\|/g,""));
54		- var i=0;while(document.anchors[i].name.match(/\D/)){i++}
55		- var startRes=parseInt(document.anchors[i+1].name.replace(/\D/g,""));
56		- if(number.match(/(\d)\D+(\d)/)){var start=parseInt(RegExp.$1);}
57		- else {var start=parseInt(number);}
58		- //alert(startRes+">"+start+" && "+start+"!="+1);
59		- if(startRes>start && start!=1){return true}else{return false}
60		-}
61	51	</script>
62	52	</head>
63	53	<body>

--- a/res/skin/skin30-2G/chie_base.css

+++ b/res/skin/skin30-2G/chie_base.css

		@@ -7,11 +7,8 @@ dt a{text-decoration:none;}
7	7	dd a{text-decoration:underline;line-height:1.1}
8	8
9	9	/* õÊ */
10		-#foundPanel{color:LightSlateGray;}
11		-#foundPanel div {font-family:"lr SVbN";}
12		-#foundPanel div span{font-family:Times;cursor:hand;}
13		-#foundPanel a {color:LightSlateGray;}
14		-#foundPanel a:hover{color:#000;}
	10	+#foundResult a {color:LightSlateGray;}
	11	+#foundResult a:hover{color:#000;}
15	12
16	13	/* dt */
17	14	dt{

--- a/res/skin/skin30-2G/chie_event.js

+++ b/res/skin/skin30-2G/chie_event.js

		@@ -1,22 +1,18 @@
1		-//========VWvÝè
2		-var buffer=1; // á¬ñüâá¬}VÌêÉÍbufferÌlðâ·Ææè³mÉWvi1â·Æ0.1bxêéj
3		-var newResJump=1; // VXWvi0:uEUC¹A1:Ç¹ÌÝA2:íj©¿ãAOpenJaneAtwintailÌÝÌÝè
4		-//==========ÈºÍXNvg{¶Å·æB
5	1	//Cxgnhè`
6	2	//OÖFtohan
7	3	//OÏFanchorHead,lightmode,getID,skinName,browser,dts
8		-//=========Ot@C¤pÌO[oÏ
9		-var waited=false;//command\¦ãtrueÉµAIðãÉfalseÉ·éB
10		-var viewed=false;//thumbÇÝãtrueÉµAthumbPanelÉæ~ãfalseÉ·éB
11		-var searched=false; //õãÉAtrueÉµAfoundPanelÉæ~ãfalseÉ·éB
12		-var cp,tp,vp,fp;
	4	+//O[oÏ
	5	+var buffer=1; // á¬ñüâá¬}VÌêÉÍbufferÌlðâ·Ææè³mÉWvi1â·Æ0.1bxêéj
	6	+var newResJump=1; // VXWvi0:uEUC¹A1:Ç¹ÌÝA2:íj©¿ãAOpenJaneAtwintailÌÝÌÝè
13	7	//========Click¨search,¼
14	8	document.onclick = clickEvent;
15	9	function clickEvent(){
16	10	if(clickCancel){return false}else{clearTimeout(clickTimer);if(document.getElementById("context")){document.getElementById("context").removeNode(true);}}
17	11	var obj=window.event.srcElement;
18	12	var tag=obj.tagName;
19		- if(tag=="B"\|\|tag=="U"\|\|tag=="SPAN"){searchPerson(obj)} //¼O,gbv,ID
	13	+ if (tag=="B") {search(obj.parentElement)} //¼O
	14	+ else if(tag=="U") {search(obj)} //gbv
	15	+ else if(tag=="SPAN"){if(getID(obj)){searchID(obj)}} //ID
20	16	else if(tag=="DT") {searchRef(obj)}
21	17	else if(tag=="DD") {defaultPopup()}
22	18	else if(tag=="A"){

		@@ -27,7 +23,7 @@ function clickEvent(){
27	23	if(obj.href.match(/^http:.*#/)){window.open(obj.href,"_parent");return false}
28	24	}
29	25	//A Boneâ³iñ\¦XÌ\¦j
30		- if((browser=="A Bone"\|\|browser=="MRir") && hiddenRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content.replace(/\/l50$/,"/")+tohan(obj.innerText.replace(/[>]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
	26	+ if(browser=="A Bone" && hidedRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content+tohan(obj.innerText.replace(/[>]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
31	27	//Jane,Live,MRirâ³iskin30-2NormalyÑMRirjXWvªscrollIntoViewÅÈ¢àÌÉWéâ³
32	28	if(browser=="A Bone" \|\| browser=="OpenJane" \|\| browser=="Live2ch" \|\| browser=="MRir"){if(obj.href.match(/^about\|jumpres/)){
33	29	var h=tohan(obj.innerText.replace(/[>]/g,""));

		@@ -36,17 +32,17 @@ function clickEvent(){
36	32	}}
37	33	return true;
38	34	}
39		- else{panelOver();return}
	35	+ else{return}
40	36	}
41	37
42	38	//=========MouseOver¨image,popup
43	39	document.onmouseover = mouseOverEvent;
44	40	function mouseOverEvent() {
45	41	var e = window.event.srcElement;
46		- if(e.tagName=='B'){if(browser!="twintail2"){
	42	+ if(e.tagName=='B'){
47	43	if(e.innerText.match(/^([^\dO-X])([\dO-X]+)([^\dO-X].*)/)){namePopup(e,RegExp.$1,RegExp.$2,RegExp.$3);}
48	44	else if(e.innerText.match(/^ Ú`ñ$/)) {abonePopup(e);}
49		- }}
	45	+ }
50	46	if(e.tagName=='A'){
51	47	if(!e.innerText.match(/%/)){ // URLGR[hÅ èª¿È%ªÈ¯êÎ
52	48	//e.href=e.href.replace(/>/g,"");

		@@ -59,8 +55,9 @@ function mouseOverEvent() {
59	55	}
60	56	}
61	57	if (checkAnchor(e.href)==2){insButton(e);return;}
62		- else if(checkAnchor(e.href)==1){ // ½i\|bvAbv
	58	+ else if(checkAnchor(e.href)==1){
63	59	if(event.shiftKey){if(e.rel){e.href=e.rel}return}
	60	+ // ½i\|bvAbv
64	61	var parent=e.parentElement;
65	62	var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText;
66	63	if(!document.getElementById("p"+aNum)){

		@@ -69,48 +66,49 @@ function mouseOverEvent() {
69	66	if(!onPopup){removePopup()}
70	67	makePopContent(e);return;
71	68	}
72		- }else if(checkAnchor(e.href)==0){ // tQÆ\|bvAbv
73		- if(e.href.match(/menu:/) && event.shiftKey){searchPopup(e)}
74	69	}
75		- }else if(e.tagName=="SPAN"\|\|e.tagName=="TT"){
76		- var obj=e;var onPopup;
77		- while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
78		- if(e.tagName=="SPAN"){
79		- if(!onPopup && event.shiftKey){searchPopup(e)}
80		- }else{searchPopup(e)}
81	70	}else{ // ½i\|bvAbvÁ
82	71	var obj=e;var onPopup;
83	72	if(obj.sourceIndex<0){obj=document.body;if(document.getElementById("popupBase")){onPopup=true;}} // namePopupÆÌ£Åm[hªOêéuÔÌñð
84		- while(obj.tagName!="BODY"){if(obj.id.match(/(p\d+)/)){onPopup=true;break}else{obj=obj.parentElement;}}
	73	+ while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement;}}
85	74	if(onPopup){while(obj.id!=obj.parentElement.lastChild.id){obj.parentElement.lastChild.removeNode(true)}}
86	75	else {removePopup()}
87	76	}
	77	+ if(e.tagName=="DT"){setHash();}
	78	+ if(e.tagName=="SPAN"){
	79	+ var obj=e;var onPopup;
	80	+ while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
	81	+ if(!onPopup && event.shiftKey){searchPopup(event.toElement);} return;
	82	+ }
88	83	}
89		-//=========MouseMove¨panelOver()
	84	+//=========MouseMove¨menuOver(),tpOver()
90	85	document.onmousemove=mouseMoveEvent;
	86	+var waited=false;//command\¦ãtrueÉµAIðãÉfalseÉ·éB
	87	+var viewed=false;//thumbÇÝãtrueÉµAthumbPanelÉæ~ãfalseÉ·éB
	88	+var cp,tp,vp;
91	89	function mouseMoveEvent() {
92	90	if(!cp){
93		- var nHTML ='<div id="controlPanel"><input type="button" value="TOP" onclick="scroll_Top();blur()"><input type="button" value="END" onclick="scroll_End();blur()"><input type="button" value="IMG" onmouseup="imgCommand();blur()"><input type="button" value="FND" onclick="fndCommand();blur();"></div><div id="foundPanel" onmouseout="searched=false"></div>';
94		- if(skinName.match(/30-2/)){nHTML+='<div id="thumbPanel" onmouseout="viewed=false"></div><div id="viewPanel"></div>';}
95		- document.body.insertAdjacentHTML("afterBegin",nHTML);
96		- cp=document.getElementById("controlPanel");fp=document.getElementById("foundPanel");
97		- if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}else{tp=vp=new Object()}
98		- cp.condition="waited";tp.condition="vp.firstChild \|\| viewed \|\| !lightmode";fp.condition=resultView ? "fp.hasChildNodes()" : "searched";
99		- cp.territory="<25"; tp.territory=">20"; fp.territory="<(30+fp.clientHeight) && fp.hasChildNodes()";
	91	+ var nHTML ="<div id='controlPanel'><input type='button' value='TOP' onclick='scroll_Top();blur()'><input type='button' value='END' onclick='scroll_End();blur()'><input type='button' value='IMG' onmouseup='imgCommand();blur()'><input type='button' value='FND' onclick='findIt(document.selection.createRange().text);blur()'></div>";
	92	+ if(skinName.match(/30-2/)){nHTML+="<div id='thumbPanel' onmouseout='viewed=false'></div><div id='viewPanel'></div>";}
	93	+ document.body.insertAdjacentHTML('afterBegin',nHTML);
	94	+ cp=document.getElementById("controlPanel");
	95	+ if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}
100	96	}
101		- if(event){panelOver();}
102		- if(!idHash.length){setHash();searchColoring();}
	97	+ cpOver();
	98	+ tpOver();
103	99	}
104		-// epl
105		-function panelOver(){
	100	+// Rg[pl
	101	+function cpOver(){
106	102	var territoryW=document.body.clientWidth-120;var territoryH=25;
107		- var panels=new Array("cp","tp","fp");
108		- for(var i in panels){
109		- if(skinName.match(/30-3/)&&panels[i]=="tp"){continue}
110		- var panel=eval(panels[i]); var territoryY=eval("event.y"+panel.territory); var territoryX=eval(event.x>document.body.clientWidth-panel.offsetWidth-15);
111		- if(eval(panel.condition)){panel.style.visibility="visible";return}
112		- if(territoryY && territoryX){panel.style.visibility="visible";}else{panel.style.visibility="hidden";}
113		- }
	103	+ if(waited){cp.style.visibility="visible";return}
	104	+ if(event.y<territoryH && event.x>territoryW){cp.style.visibility="visible";}else{cp.style.visibility="hidden";}
	105	+}
	106	+// TlCpl
	107	+function tpOver(){
	108	+ if(skinName.match(/30-3/) \|\| !lightmode){return}
	109	+ var territoryW=document.body.clientWidth-120;var territoryH=20;
	110	+ if(document.getElementById("viewPanel").firstChild \|\| viewed){tp.style.visibility="visible";return}
	111	+ if(event.y>territoryH && event.x>territoryW){tp.style.visibility="visible";}else{tp.style.visibility="hidden";}
114	112	}
115	113	// TOP,END
116	114	function scroll_Top(){document.getElementsByTagName("DL")[0].firstChild.scrollIntoView(true);}

		@@ -129,14 +127,6 @@ function imgCommand(mode,s){
129	127	clearCommand();
130	128	}
131	129	}
132		-function fndCommand(mode,s){
133		- if(!waited){
134		- findIt(document.selection.createRange().text);
135		- event.cancelBubble=true;
136		- }else{
137		- clearCommand();
138		- }
139		-}
140	130	function clearCommand(){
141	131	waited=false;
142	132	document.getElementById("command").removeNode(true);

		@@ -184,7 +174,7 @@ function key(){
184	174	else if(code=="36"){scroll_Top()}
185	175	else if(code=="35"){scroll_End()}
186	176	else if(code=="73" && event.shiftKey){changePanel();return false;} // shift+I
187		- else if(code=="70" && event.shiftKey){findIt(document.selection.createRange().text);return false;} // shift+F
	177	+ else if(code=="70" && event.shiftKey){cp.childNodes[3].click();return false;} // shift+F
188	178	else if(code=="78" && event.shiftKey && firstNew){firstNew.scrollIntoView(true)} // shift+N
189	179	else if(code=="82" && event.shiftKey && event.ctrlKey){ // ctrl+shift+R
190	180	//©¿ã`µáâ³iÂXVÌV[gJbgL[j

		@@ -200,7 +190,7 @@ function key(){
200	190	//=========©¿ãAABoneA]kQ
201	191	var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
202	192	var k=0;
203		-function loadEvent(num){
	193	+function loadEvent(num){ //setTimeout("setHash();",100);
204	194	//====VXWv
205	195	if(newResJump==0){clearInterval(timerID);return} //uuEUC¹vÈçI¹
206	196	//VXÌJnÔðæ¾

		@@ -219,7 +209,7 @@ function loadEvent(num){
219	209	//=========VXæ¾ãiWXLÎuEUpj©NewMark©çÄÑoµ
220	210	//=========OpenJAtwin
221	211	var scr,viewPos,endPos=0;
222		-function reloadEvent(){
	212	+function reloadEvent(){ //setTimeout("setHash();",100);
223	213	//====ùÇ»
224	214	var lastDt=dts[dts.length-2];if(!lastDt){return}// SVÈçI¹
225	215	while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}

		@@ -252,10 +242,10 @@ function defaultPopup(){
252	242	obj.innerText=num;
253	243	obj.href="#"+hnum;
254	244	makePopContent(obj);
255		- }else if(num.match(/\w{8,9}/)){ //\w{8}ÅÍ¾ßÛH
256		- var obj=document.createElement("DT");
257		- obj.innerHTML="<span>date time ID:"+num+"</span>";
258		- searchPerson(obj.firstChild);
	245	+ }else if(num.match(/\w/) && num.length==8){ //\w{8}ÅÍ¾ßÛH
	246	+ var obj=document.createElement("span");
	247	+ obj.innerText="date time ID:"+num;
	248	+ setHash();searchID(obj);
259	249	}
260	250	}
261	251

		@@ -270,14 +260,5 @@ function copyEvent(){
270	260	copyText.execCommand("Copy");
271	261	return false;
272	262	}
273		-//=========onScroll
274		-//window.onscroll=function(){clearInterval(beforeScrollTimer);onLoadEvent()}
275		-window.onscroll=function(){onLoadEvent()}
276		-if(document.getElementById("dl")){
277		- document.getElementById("dl").onscroll=function(){onLoadEvent()}
278		-}
279		-//=========onLoad
280		-window.onload=onLoadEvent;
281		-function onLoadEvent(){mouseMoveEvent();setHash();searchColoring();}
282		-setTimeout("onLoadEvent()",1000); // êñ¾¯F
283		-
	263	+//=========onLoadiDAT2HTMLÌÝj
	264	+window.onload=function(){setHash()}

--- a/res/skin/skin30-2G/chie_image.css

+++ b/res/skin/skin30-2G/chie_image.css

		@@ -18,7 +18,7 @@ input,button{
18	18	}
19	19	#thumbPanel div{
20	20	width:100px;
21		- margin-bottom:0px;
	21	+ margin-bottom:2px;
22	22	border:solid 1px #D6DCE1;
23	23	background-color:#FFF;
24	24	text-align:right;

--- a/res/skin/skin30-2G/chie_image.js

+++ b/res/skin/skin30-2G/chie_image.js

		@@ -1,11 +1,9 @@
1		-//======æÇÌÝè
2		-var onOpenLoad =1; // XÇÌæÇ@0:ÇÝÜÈ¢A1:VXÌÝA2:S
3		-var onMouseLoad=true; // true:J[\ðí¹½¾¯Afalse:LOAD{^ðNbNµÄ©ç
4		-var takeArisk=false; // true:æÇÝÝÉ[hØÖAfalse:è®Å[hØÖ
5		-//==========ÈºÍXNvg{¶Å·æB
6	1	// CxgnhFonMouseover
7	2	// OÖFaddAnchor
8	3	// OÏFcp,tp,vp,dds
	4	+//======æÇÌÝè
	5	+var onMouseLoad=true; // true:J[\ðí¹½¾¯Afalse:LOAD{^ðNbNµÄ©ç
	6	+var takeArisk=false; // true:æÇÝÝÉ[hØÖAfalse:è®Å[hØÖ
9	7	//==========O[oÏ
10	8	//==========æ
11	9	var lightmode = true;

		@@ -58,22 +56,14 @@ function insButton(a,hRH) {
58	56	var nHTML='<input type="button" value="LOAD" onClick=\'loadImage(this,"'+a.href+'");blur()\'>'
59	57	+'<input type="button" value="VIEW" onClick=\'changeView("swf","'+a.href+'");blur()\'>';
60	58	}else{
61		- var ahref=(hRH)?hRH:a.href;
	59	+ if(hRH){var ahref=hRH}else{var ahref=a.href}
62	60	if(ahref.match(/^javascript:.'(.)'.*/)){ahref=RegExp.$1+document.getElementsByName("ThreadURL")[0].content;a.href=ahref}
63	61	var nHTML='<input type="button" value="VIEW" onClick=\'changeView("html","'+ahref+'");blur()\'>'
64		- +'<input type="button" value="CHECK" onClick=\'changeView("html","http://so.7walker.net/?site='+ahref+'");blur()\'>';
	62	+ ;//+'<input type="button" value="CHECK" onClick=\'changeView("html","http://www.tekijuku.com/URL/?url='+ahref+'");blur()\'>';
65	63	}
66	64	a.insertAdjacentHTML('AfterEnd',nHTML);
67	65	a.className = 'replaced';
68		- if(imageExt2(a.href)){
69		- if(!event\|\|event.type=="mousemove"\|\|event.type=="scroll"){ // autoImageLoadÅÌÇ
70		- if(onOpenLoad){loadImage(a.nextSibling,a.href)}
71		- }else if(event.type=="mouseover"){ // mouseoverÅÌÇ
72		- if(onMouseLoad){loadImage(a.nextSibling,a.href)}
73		- }else if(event.type=="click"){ // allImageloadÅÌÇ
74		- loadImage(a.nextSibling,a.href);
75		- }
76		- }
	66	+ if(onMouseLoad && imageExt2(a.href)){loadImage(a.nextSibling,a.href)}
77	67	return;
78	68	}
79	69	}

		@@ -81,19 +71,19 @@ function insButton(a,hRH) {
81	71	function loadImage(btn,href){
82	72	if(!panel){changePanel()}
83	73	if(takeArisk && lightmode){changeMode()}
84		- // ¯êæmF
85		- var thumbs = document.images;
86		- var l=thumbs.length;
87		- for(var i=l;i--;){if(thumbs[i].src==href){
88		- if(lightmode){tp.style.visibility="visible";viewed=true;}
89		- //thumbs[i].scrollIntoView(true);
90		- imgOver(thumbs[i],100);
91		- return true;
92		- }}
	74	+ if(btn.tagName!="A"){
	75	+ var thumbs = document.images;
	76	+ var l=thumbs.length;
	77	+ for(var i=l;i--;){if(thumbs[i].src==href){
	78	+ if(lightmode){tp.style.visibility="visible";viewed=true;}
	79	+ //thumbs[i].scrollIntoView(true);
	80	+ imgOver(thumbs[i],100);
	81	+ return true;
	82	+ }}
	83	+ }
93	84	if(btn.parentElement.tagName=="DD"){var dt = btn.parentElement.previousSibling;}
94	85	else {var dt = btn.parentElement;}
95	86	var num = dt.firstChild.innerText;
96		- if(href.match(/www.securityfocus.com/)){if(!confirm(num+"ÌXÉ éhttp://www.securityfocus.com/ÌæÍuNÌÂ\«ª¢Å·ªAJ«Ü·©H")){return}}
97	87	if(href.search(/\.swf/i)==-1){
98	88	var nHTML = '<div><img src="'+href+'" onLoad="imgResult(this)" onError="imgResult(this)" onClick="changeView(\'img\')" onmouseover="imgOver(this,100)" onmouseout="imgOver(this,30)">'
99	89	+addAnchor(num,num)+' '

		@@ -116,14 +106,7 @@ function loadImage(btn,href){
116	106	function imgResult(img){
117	107	var btn=img.parentElement.children.item(2);
118	108	if(event.type=="load"){btn.value='___'; img.style.display='block';}
119		- else {btn.value='NONE';btn.style.color='#C00';}
120		- if(event.type=="error"){
121		- var dt=getDTfromAnc(img.parentElement.children.item(1).innerText);
122		- var ddAnc=dt.nextSibling.getElementsByTagName("A");
123		- var a;var i=0;do{a=ddAnc[i];i++;}while(a.href!=img.href);
124		- var btn=a.nextSibling;
125		- btn.value='NONE';btn.style.color='#C00';
126		- }
	109	+ else {btn.value='NONE';btn.style.color='#C00';setTimeout("viewed=false",3000)}
127	110	}
128	111	// TCYÌØÖ
129	112	function changeSize(btn){

		@@ -204,10 +187,12 @@ function allImageLoad(mode){
204	187	var ddl=dds.length;var exist;
205	188	for(var i=0;i<ddl;i++){
206	189	if(mode=="new"){if(dds[i].previousSibling.className!="new"){continue}}
207		- var ddAnc=dds[i].getElementsByTagName("A");
208		- for(j=0;j<ddAnc.length;j++){
209		- cn=ddAnc[j];
210		- if(imageExt2(cn.href)){insButton(cn,cn.href);exist=true}
	190	+ cl=dds[i].childNodes.length;
	191	+ for(j=0;j<cl;j++){
	192	+ cn=dds[i].childNodes[j];
	193	+ if(cn.tagName == "A"){
	194	+ if(imageExt2(cn.href)){loadImage(cn,cn.href);exist=true}
	195	+ }
211	196	}
212	197	}
213	198	if(!exist){

--- a/res/skin/skin30-2G/chie_popup.js

+++ b/res/skin/skin30-2G/chie_popup.js

		@@ -1,6 +1,4 @@
1		-//==========ÈºÍXNvg{¶Å·æB
2	1	// CxgnhFonMouseover
3		-// OÏFidHash,refHash,foudRes,highlight
4	2	// OÖFaddAnchor,getDTfromAnc
5	3	// Á¥FDIV#popupBaseºÉutbgÅjAvÉDL#p\dðì¬·éB
6	4	//==========CSSÌoÍ

		@@ -11,65 +9,65 @@ nCSS+='#popupBase dl{position:absolute; background-color:window; border:outset 1
11	9	nCSS+='#popupBase dt span{float:none; margin-left:1em;}';
12	10	nCSS+='#popupBase dd{margin:auto 1em}';
13	11	document.write('<style type="text/css">'+nCSS+'</style>\n');
14		-//=========Ot@C¤pÌO[oÏ
	12	+//=========O[oÏ
	13	+var pb;
15	14	//=========io[È¼OÌ\|bvAbv
16	15	function namePopup(e,before,num,after){
17	16	var hnum=tohan(num);
18		- if(hnum==774 \|\| hnum==21 \|\| hnum==1 \|\| hnum==30){return} // Socket774A774KBA21ÖA[1-30]AÈÇÍ³
19		- if(before && before.match(/¼³/)){return} //¼³µÁÛ¢ÌÍ³
20		- if(after) {if(after=="üN"){return}} // ftHgÈ"üN"Í³
	17	+ //RüNASüNASocket774A774KBA21ÖA[1-30]AÈÇÍ³
	18	+ if(before){if(hnum==5 \|\| hnum==774 \|\| hnum==4 \|\| hnum==21 \|\| hnum==1 \|\| hnum==30){return}}
21	19	var nB = before ? "<b>"+before+"</b><b>":"<b>"; nB+=addAnchor(hnum,num); nB+=after ? "</b><b>"+after+"</b>":"</b>";
22	20	e.outerHTML=nB;
23	21	}
24	22	//=========ã Ú`ñÌ\|bvAbv
25		-function abonePopup(e){e.outerHTML = "<b>"+addAnchor(e.parentElement.previousSibling.innerText,' Ú`ñ')+"</b>";}
26		-//=========õµ½XÌ\|bvAbv
27		-function searchPopup(obj){
28		- var reg,cArray;var tag=obj.tagName;
29		- /ref Popup/if (tag=="A") {if(refHash[obj.innerText]){cArray=refHash[obj.innerText].split(" ")}else{return}}
30		- /ID Popup/ else if(tag=="SPAN"){reg=getID(obj);if(reg&&reg.length>3){cArray=idHash[reg].split(" ");}else{return} if(cArray.length==1){return}}
31		- /õPopup/else if(tag=="TT") {var cHash=(obj.parentElement.rel=="res")?foundRes:highlight;cArray=cHash[obj.parentElement.firstChild.style.backgroundColor];if(!cArray){return}}
32		- var targetString=""; for(var i=0;i<cArray.length;i++){targetString+=returnString(cArray[i]);} //gÌØèoµ
33		- if(targetString){popup(targetString);} //ÎÛª¶Ýµ½ç\|bvAbv
	23	+function abonePopup(e){
	24	+ var hnum=e.parentElement.previousSibling.innerText;
	25	+ e.outerHTML = "<b>"+addAnchor(hnum,' Ú`ñ')+"</b>";
34	26	}
35	27	//=========½i\|bvAbv
36	28	//E\|bvAbvÌì¬
	29	+var startRes;
37	30	function makePopContent(obj){
38	31	//Oõ
39		- var num=obj.innerText.replace(/[>]/g,""); var number=tohan(num);
40		- if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:"; // uEU{ÌÌ\|bvAbvñð
41		- //Ô²¸
	32	+ var num=obj.innerText.replace(/[>]/g,"");
	33	+ var number=tohan(num);
	34	+ if(!obj.rel){obj.rel=obj.href;}
	35	+ obj.href="decoy:";
	36	+ //²¸
	37	+ if(document.anchors.length==1){return} //Xª1ÈçI¹
	38	+ if(!startRes){startRes=parseInt(document.anchors[1].name.replace(/\D/g,""))}
42	39	if(number.match(/(\d)\D+(\d)/)){var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);}
43	40	else {var start=end=parseInt(number);}
44		- if(end-start>100){end=start+100} // 100Èã\¦µÈ¢
	41	+// alert(startRes+">"+end+" && "+end+"!=1")
	42	+ if(startRes>end && end!=1){obj.href=obj.rel;return}//¶ÝµÄ¢È¯êÎI¹
45	43	//gÌØèoµ
46		- var targetString=""; for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}
	44	+ var targetString=""; if(end-start>100){end=start+100}
	45	+ if(start==end){targetString=returnString(start)}
	46	+ else {for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}}
47	47	//ÎÛª¶Ýµ½çrelÉÞðµÄ\|bvAbv
48	48	if(targetString){popup(targetString);}else{obj.href=obj.rel;}
49	49	}
50	50	//EgÌØèoµ
51	51	function returnString(num){
52	52	var obj=getDTfromAnc(num);
53		- setSearchColor(obj);//\|bvAbvæÌF
54	53	if(!obj){return("")} //ÎÛª§¾ Ú`ñÈçI¹
55		- var dt=obj.cloneNode(true);
56		- var dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBERÎÌàÌÉWéNAJ[Ì
57		- var dd=obj.nextSibling.cloneNode(true);
	54	+ var dt,dd,dtOuter,ddOuter;
	55	+ dt=obj.cloneNode(true);
	56	+ dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBERÎÌàÌÉWéNAJ[Ì
	57	+ dd=obj.nextSibling.cloneNode(true);
58	58	if(dd.hasChildNodes()){
59	59	while(dd.lastChild.name){dd.lastChild.removeNode(true)} // LABELNUMBERñÎÌàÌÉWéNAJ[Ì
60	60	if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true)} // tQÆÌ
61	61	}
62		- var ddOuter=dd.outerHTML;
	62	+ ddOuter=dd.outerHTML;
63	63	return(dtOuter+ddOuter);
64	64	}
65	65	//E\|bvAbv
66		-var pb;
67	66	function popup(inner){
68	67	if(!pb){document.body.insertAdjacentHTML('afterBegin','<div id="popupBase"></div>');pb=document.getElementById("popupBase")}
69	68	//vfÌì¬
70	69	var parent=event.srcElement.parentElement;
71		- //var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDÈO¼OAæAIDõ
72		- var aNum=event.srcElement.sourceIndex;if(!aNum){alert("aNumæ¾G[")}
	70	+ var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDÈO¼OAæAIDõ
73	71	if(document.getElementById('p'+aNum)){return} // \|bvAbvµÄ½çI¹
74	72	pb.insertAdjacentHTML("beforeEnd",'<dl id="p'+aNum+'">'+inner+'</dl>');
75	73	//vfÌzu

		@@ -77,16 +75,16 @@ function popup(inner){
77	75	// y²²®
78	76	var pos=Math.min(event.y,document.body.clientHeight-event.y);
79	77	var scTop=document.body.scrollTop+event.y;
80		- if(pos==event.y){var y=scTop-30;} // J[\ÌºÖ\¦
81		- else {var y=scTop+10-p.clientHeight;} // J[\ÌãÖ\¦
	78	+ if(pos==event.y){var y=scTop-30;} // º
	79	+ else {var y=scTop+10-p.clientHeight;} // ã
82	80	if(y<0){y=0}
83		- if(event.srcElement.parentElement.tagName=="TT"){y+=35;}
	81	+ if(event.srcElement.parentElement.id=="foundResult"){y+=30}
84	82	p.style.pixelTop=y;
85	83	// x²²®
86	84	var pos=Math.min(event.x,document.body.clientWidth-event.x);
87	85	var scLeft=document.body.scrollLeft+event.x;
88		- if(pos==event.x){var x=scLeft-2} // J[\ÌEÖ\¦
89		- else {var x=scLeft-4-p.clientWidth;} // J[\Ì¶Ö\¦
	86	+ if(pos==event.x){var x=scLeft-2} // E
	87	+ else {var x=scLeft-4-p.clientWidth;} // ¶
90	88	if(x<0){x=0}
91	89	p.style.pixelLeft=x;
92	90	// ³²®iscrollBarðv·êÆvµÈ¢êª éj¨y²²®

--- a/res/skin/skin30-2G/chie_search.js

+++ b/res/skin/skin30-2G/chie_search.js

		@@ -1,398 +1,243 @@
1		-beID=false; // beÉOCoéêÍAtrue
2		-//==========õÝè
3		-var expression="multiAND"; // õû@@@default:WAregExp:³K\»AmultiAnd:ANDõAmultiOR:ORõ
4		-var searchView="resList"; // õÊ\¦@@resList:YXÔ\¦AresPopup:YX\|bvAbvA
5		-var resultView=false; // õÊÌí\¦@@true:í\¦Afalse:}EXÅßÃ¯½Æ«ÌÝ\¦
6		-var listLimit =10; // searchViewªresPopupÅÈ¢êÌAXÔÌ\¦§À
7		-//==========XÔAút¶ñÌFÝè
8		-coloring=1; // F·é:1@FµÈ¢:0
9		-threshold1=[2,"#0000ff"]; // «Ýª¡ éID Ìµ«¢lÆF
10		-threshold2=[5,"#aaaa00"]; // «Ýª½ éID Ìµ«¢lÆF
11		-threshold3=[8,"#ff0000"]; // «Ýª½ éID Ìµ«¢lÆF
12		-threshold4=[1,"#0000FF"]; // «Ýª é X Ìµ«¢lÆXÔÌF
13		-threshold5=[4,"#aaaa00"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
14		-threshold6=[7,"#ff0000"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
15		-//==========¼OEIDõÉæéXÌÑÌFwèi16iÍWeb`®ÌF¼ÅwèB¢ÂÅàÂBAt@xbgÍ¬¶Å¨è¢j
16		-var foundResColor =new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
17		-//==========PêõÉæénCCgFwèi¯ãj
18		-var highlightColor=new Array("#ffff66","#a0ffff","#99ff99","#ff9999","#ff66ff","#880000","#00aa00","#886800","#004699","#990099");
19		-//==========ÈºÍXNvg{¶Å·æB
20		-// CxgnhFonClick,onScroll,onMousemove
21		-// OÖFaddAnchor,checkAnchor,tohan,searchPopup
22		-// OÏFanchorHead,browser,fp
23		-// tQÆÌÁ¥FCxg¶DTÉÎ·éDDºÉADL-DT-DD\¢ðì¬·éB
	1	+// út¶ñÌFÝè@F·é:1@FµÈ¢:0
	2	+coloring=1;
	3	+threshold1=[2,"#0000FF"]; // «Ýª¡ éID Ìµ«¢lÆF
	4	+threshold2=[5,"#FF0000"]; // «Ýª½ éID Ìµ«¢lÆF
	5	+threshold3=[1,"#0000FF"]; // «Ýª é X Ìµ«¢lÆXÔÌF
	6	+threshold4=[4,"#FF0000"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
	7	+// CxgnhFonClick
	8	+// OÖFaddAnchor,checkAnchor,tohan
	9	+// OÏFanchorHead,browser
	10	+// Á¥FCxg¶DTÉÎ·éDDºÉADL-DT-DD\¢ðì¬·éB
24	11	//==========CSSÌoÍ
25	12	var nCSS='';
26		-nCSS+='#foundPanel {position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999;visibility:hidden}';
27		-nCSS+='#foundPanel div{padding-left:5px;text-align:right;font-size:100%;}';
	13	+nCSS+='#foundResult{position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999}';
28	14	nCSS+='.refResult{margin:0.5em 0.3em; border:1px solid #666;padding-right:0px}';
29	15	nCSS+='.refResult{border-top:none}';
30	16	nCSS+='.refResult dt{margin-right:0px;}';
31	17	nCSS+='.refResult dd{margin-left:0.8em;}';
32	18	document.write('<style type="text/css">'+nCSS+'</style>\n');
	19	+//==========õÉæéFwèi16iÍWeb`®ÌF¼ÅwèB¢ÂÅàÂj
	20	+var foundColor = new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
33	21	var nCSS='';
34		-for(var css in foundResColor){
35		- var c=foundResColor[css].replace(/#/,"");
36		- nCSS+='#COLOR'+c+" a{border-color:"+foundResColor[css]+"}\n";
37		- nCSS+='#COLOR'+c+" a:hover{border-color:red}\n";
	22	+for(var css=0;css<foundColor.length;css++){
	23	+ nCSS+='#COLOR'+css+" a{border-color:"+foundColor[css]+"}";
	24	+ nCSS+='#COLOR'+css+" a:hover{border-color:red}";
38	25	}
39	26	document.write('<style type="text/css">'+nCSS+'</style>\n');
40		-//=========Ot@C¤pÌO[oÏ
	27	+//==========O[oÏ
41	28	var dts=document.getElementsByTagName('DT');
42	29	var dds=document.getElementsByTagName('DD');
43		-var idHash=new Array(); var refHash=new Array();
44		-var foundRes,highlight;
	30	+var fR;
45	31	//==========IDÆQÆðnbVÉi[
46		-// zñÌnbVæèy¢ÁÛ¢ÌÅAóæØèÌlÉæéPÈnbVÉµÄÝéeXgB
47		-// setEndIdx:{¶Ì¯Xðd¡µÈ¢æ¤ÉAHash»ÊuÆµÄÌdtsÌÅIindexðL¯
48		-// setEndNum:{¶ÈOXðd¡µÈ¢æ¤ÉAÅIXÔðL¯
49		-var setEndIdx=setEndNum=0;
	32	+var idHash=new Array(); var refHash=new Array(); var searchEnd=0;
50	33	function setHash(){
51		- //var t0=new Date();
52		- var l=Math.min(dts.length,dds.length);
53		- var lastNum=l ? parseInt(dts[l-1].firstChild.innerText) : 0;
54		- if(isNaN(lastNum)&&l>1){lastNum=parseInt(dts[l-2].firstChild.innerText)} //Footer èÈçêÂO
55		- if(l==0 \|\| lastNum<=setEndNum){return} // ÅãÜÅ²¸ÏÝÈçñð
56		- for(var i=setEndIdx;i<l;i++){
	34	+ var l=dts.length;
	35	+ if(dts[l-1].rel=="setEnd"){return} // ÅãÜÅ²¸ÏÝÈçñð
	36	+ for(var i=searchEnd;i<l;i++){
57	37	if(dds[i].parentElement.className=="refResult"){continue} // tQÆàÌDDÈçñð
58	38	var num=dts[i].firstChild.innerText; var span=dts[i].lastChild;
59	39	// ID
60		- var t=getID(span); if(t&&t.length>3){idHash[t] = idHash[t] ? idHash[t]+" "+num : num;} // ???âID:0,ID:#(@]k)ÍX[B
61		- // æÂ
62		- var imgURL=getIMG(span);
63		- if(imgURL){
64		- var dd=dts[i].nextSibling;
65		- if(tp && imgURL && !dd.getElementsByTagName("IMG").length){
66		- var aObj=(dd.innerText)?'<br><a href="'+imgURL+'">'+imgURL+'</a>':'<a href="'+imgURL+'">'+imgURL+'</a>';
67		- if(!beID && imgURL.match(/kako/)){/dd.insertAdjacentHTML("beforeEnd","<br>BeÉOCµÄÈ¢Ææ¾Å«Ü¹ñ");/}else{dd.insertAdjacentHTML("beforeEnd",aObj)}
68		- }
69		- }
70		- // ref,IMG
	40	+ var t=getID(span); idHash[t] = idHash[t] ? idHash[t]+" "+num : num;
	41	+ // ref
71	42	var ddAnc=dds[i].getElementsByTagName("A");
72		- for(var j=0;j<ddAnc.length;j++){
73		- if (checkAnchor(ddAnc[j].href)==0){
74		- continue;
75		- }else if(checkAnchor(ddAnc[j].href)==1){
76		- var anc=tohan(ddAnc[j].innerText.replace(/[>]/g,""));var start,end;
77		- if(anc.match(/(\d)\D+(\d)/)){
78		- start=parseInt(RegExp.$1); end=parseInt(RegExp.$2);
79		- if( (end-start>100) \|\| (num-end<4 && start==1) ){continue} // >>1-1000Æ©>>1-n(¼OX)Æ©ÍØíÉX[
80		- }else{
81		- start=end=parseInt(anc);
	43	+ for(var j=ddAnc.length;j--;){
	44	+ if(checkAnchor(ddAnc[j].href)!=1){continue}
	45	+ var anc=tohan(ddAnc[j].innerText.replace(/[>]/g,""));
	46	+ if(anc.match(/(\d)\D+(\d)/)){
	47	+ var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);
	48	+ if(end-start>100){continue} // >>1-1000Æ©ÍØíÉX[
	49	+ else if(num-end<3 && start==1){continue} // >>1-n(¼OX)ÍË,Æ©àX[
	50	+ for(var k=start;k<=end;k++){
	51	+ if(refHash[k] && refHash[k].indexOf(num)!=-1){continue} // d¡ÍX[
	52	+ if(num>=k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // ¢ÖÌAJ[ÍX[
82	53	}
83		- var k=start-1;do{k++;
84		- if((!refHash[k] \|\| refHash[k].indexOf(num)==-1) && num>k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // d¡â¢ÖÌAJ[ÍX[
85		- }while(k<end);
86		- }else if(imageExt2(ddAnc[j].href) && onOpenLoad!=0){
87		- if(onOpenLoad==1){if(dds[i].previousSibling.className!="new"){continue}}
88		- insButton(ddAnc[j],ddAnc[j].href);
	54	+ }else{anc=parseInt(anc);
	55	+ if(refHash[anc] && refHash[anc].indexOf(num)!=-1){continue} // d¡ÍX[
	56	+ if(num>=anc){refHash[anc]=refHash[anc] ? refHash[anc]+" "+num : num;} // ¢ÖÌAJ[ÍX[
89	57	}
90	58	}
91	59	}
92		- setEndIdx=l;setEndNum=lastNum;
93		- //var t1=new Date(); var t=(t1-t0)/1000; if(t){alert(t+"b");}
94		-}
95		-// XbhEBhESÉOã5XðF
96		-var resUnit=new Array();
97		-function searchColoring(){
	60	+ dts[l-1].rel="setEnd"; searchEnd=l;
98	61	if(!coloring){return;} // FsvÈçI¹
99		- if(!scr){scr=lightmode ? document.body : document.getElementById("dl");}
100		- var nowScrollPos=scr.scrollTop+document.body.clientHeight/2;
101		- var l=Math.min(dts.length,dds.length);var st,ed;
102		- // dtÌoffsetTopði[i25XPÊj
103		- if(resUnit.length<=Math.floor(dts.length/25)){resUnit[0]=0;
104		- for(var i=25;i<l;i+=25){resUnit[i/25]=dts[i].offsetTop;}
105		- }
106		- // »ÝÇÌ ½èÜÅXN[µÄé©²¸
107		- var rul=resUnit.length-1;
108		- if (rul==0) {st=0;ed=l-1;} //25¢
109		- else if(resUnit[0]>nowScrollPos) {st=0;ed=24;} //0-24
110		- else if(resUnit[rul]<nowScrollPos){st=l-26;ed=l-1;} // ÅI25X
111		- else{
112		- for(var i=rul;i--;){
113		- if(resUnit[i+1]>nowScrollPos&&resUnit[i]<=nowScrollPos){st=i*25;ed=st+25;break}
	62	+ for(var i=l;i--;){
	63	+ if(!dts[i].innerText){continue}
	64	+ //if(dts[i].innerText.match(/id:/i)){ // IDªÈ¢ÂÅA¬»·é©àH
	65	+ var span=dts[i].lastChild; var t=getID(span); if(browser=="zbg]kQ"){span=span.lastChild}
	66	+ if(t && idHash[t] && span){
	67	+ var idResult=idHash[t].split(/\s/); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
	68	+ if (idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
	69	+ else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
	70	+ else if(idResult.length==1){span.title="¯êIDÍ\n èÜ¹ñ"}
	71	+ }
	72	+ //}
	73	+ var imgURL=getIMG(span);
	74	+ if(imgURL){dds[i].insertAdjacentHTML("afterBegin",'<img src="'+imgURL+'"><br>')}
	75	+ //
	76	+ var numA=dts[i].firstChild; var num=numA.innerText;
	77	+ if(refHash[num]){
	78	+ var refResult=refHash[num].split(/\s/);
	79	+ if (refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dts[i].title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
	80	+ else if(refResult.length>=threshold3[0]){numA.style.color=threshold3[1];dts[i].title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
	81	+ else{numA.title="±êÖÌXÍÈ¢Íl"}
114	82	}
115	83	}
116		- // »ÝÌÍÍà©çEBhEÌ^ñ ½èÉ\¦µÄéXðæ¾i±±ÅF·éÆA25XPÊÌØÖÉXªF³êÈ¢j
117		- var dtIdx=0; //if(cp){cp.childNodes[1].value=(st+1)+"-"+(ed+1);cp.style.visibility="visible";}
118		- for(var i=st;i<=ed;i++){if(!dts[i+1]){dtIdx=ed;break;}
119		- if(dts[i+1].offsetTop>nowScrollPos && dts[i].offsetTop<=nowScrollPos){dtIdx=i;break;}
120		- }
121		- // dtIdx©ç»ÌüÓðÁè
122		- var start=dtIdx-5;var end=dtIdx+5;//
123		- for(var i=start;i<=end;i++){
124		- if(dts[i]){setSearchColor(dts[i])}
125		- }
126	84	}
127		-// IDHashArefHashð³ÉF
128		-function setSearchColor(dt){
129		- if(!dt.innerText){return}
130		- // ID
131		- var span=dt.lastChild; var t=getID(span);//alert(t +"&&"+ idHash[t] +"&&"+ span);
132		- if (browser=="zbg]kQ"){span=span.lastChild}
133		- else if(browser=="A Bone") {span=span.childNodes[1]}
134		- if(t && idHash[t] && span){
135		- var idResult=idHash[t].split(" "); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
136		- if (idResult.length>=threshold3[0]){span.style.color=threshold3[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
137		- else if(idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
138		- else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
139		- else if(idResult.length==1){span.title="¯êIDÍ\n èÜ¹ñ"}
140		- }
141		- // ref
142		- var numA=dt.firstChild; var num=numA.innerText;
143		- if(refHash[num]){
144		- var refResult=refHash[num].split(" ");
145		- if (refResult.length>=threshold6[0]){numA.style.color=threshold6[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
146		- else if(refResult.length>=threshold5[0]){numA.style.color=threshold5[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
147		- else if(refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
148		- else{numA.title="±êÖÌXÍÈ¢Íl"}
149		- }
	85	+var regIMG=new RegExp(".?\\s.?\\s.:.?\\sIMG:(.*?)(\\s\|$)"); // æàÂ\ÉµÄÝé
	86	+function getIMG(obj){
	87	+ if(regIMG.test(obj.innerText)){
	88	+ var filename=RegExp.$1;
	89	+ var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
	90	+ var fileurl="http://up01.2ch.io/_img/"+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
	91	+ return(fileurl)
	92	+ }else{return(false)}
150	93	}
151	94	//==========¼OEIDõ
152		-function searchPerson(obj){
153		- var by,thisDT,reg;
154		- if (obj.tagName=="DT") {by="ID"; thisDT=obj; reg=getID(obj)}
155		- else if(obj.tagName=="SPAN"){by="ID"; thisDT=obj.parentElement;reg=getID(obj)}
156		- else if(obj.tagName=="U") {by="NAME";thisDT=obj.parentElement; reg=obj.innerHTML.replace(/<B>(.?)<\/B>/ig,"");if(!reg){reg=RegExp.$1.replace(/<.?A.?>/ig,"")}/¼Oª*/}
157		- else if(obj.tagName=="B") {by="NAME";thisDT=obj.parentElement.parentElement;reg=obj.innerText}
158		- else{return}
159		- if(!thisDT.rel){
160		- var c=selectColor("res"); if(!c){return} var color=new Array(c); // J[Ið
161		- if(by=="ID"){
162		- if(!reg \|\| !idHash[reg]){return} // IDÈµAID:???A{¶Ì¼XÌRsyID
163		- // õnbVÉlðÝèµÄA»êÉîÃ«XF
164		- foundRes[c]=idHash[reg].split(" "); foundRes[c].word="ID:"+reg;
165		- for(i in foundRes[c]){var dt=getDTfromAnc(foundRes[c][i]);toggleResColor(dt,c);}
166		- }else{
167		- var us=document.getElementsByTagName("U"); var l=us.length;
168		- var regName=new RegExp();regName.compile(reg);
169		- // [vÉXFElÌÝèð¯Às
170		- for(var i=l;i--;){var dt=us[i].parentElement;
171		- if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
172		- if(regName.test(us[i].innerText)){toggleResColor(dt,c);foundRes[c].unshift(dt.firstChild.innerText);}
173		- }
174		- foundRes[c].word=reg;
175		- }
176		- returnFound("res",color);
	95	+// IDÌõEí
	96	+function searchID(obj){
	97	+ var singleColor=event.altKey;
	98	+ var decoy=obj.parentElement ? obj.parentElement : obj;
	99	+ var reg=getID(obj);
	100	+ if(!decoy.id.match(/^COLOR/)){
	101	+ if(!idHash[reg]){return}
	102	+ var target=new Array();target=idHash[reg].split(" ");
	103	+ // J[Ið
	104	+ var c = singleColor ? 0 : selectColor();
	105	+ if (c=="restart"){c=0;singleColor=true}
	106	+ else if(c=="exit"){return;}
	107	+ // õ
	108	+ for(i in target){var dt=getDTfromAnc(target[i]);activate(dt,c);}
	109	+ foundReturn(target);
177	110	}else{
178		- clearColor("res",thisDT.style.backgroundColor);
	111	+ clearResult(obj);return;
179	112	}
180	113	}
181		-// ID¶ñÌo
182		-var regID=new RegExp(); // HOSTàÂ\ÉµÄÝé
183		-regID.compile(".?\\s.?\\s.:(.?)(\\s\|$)"); // 1000resÅ0.02bÙÇ¬
184		-function getID(span){
185		- if(regID.test(span.innerText)){return(RegExp.$1)}else{return(false)}
186		-}
187		-//==========FÝèð
188		-// IuWFNgÌú»
189		-function createHash(name,key,arr,word){
190		- name[key]=arr?arr:new Array();
191		- name[key].word=word?word:"";
192		- name[key].justMovedRes=undefined;
193		-}
194		-// FIð(YXÔzñð½È¢L[ðÔ·)
195		-function selectColor(type){
196		- if(!foundRes) {foundRes =new Array();for(var i in foundResColor) {createHash(foundRes,foundResColor[i]);}} // Hash foundRes ={F:YXÔzñ}
197		- if(!highlight){highlight=new Array();for(var i in highlightColor){createHash(highlight,highlightColor[i]);}} // Hash hightLight={F:YXÔzñ}
198		- var cHash,cArray,cMess;
199		- if(type=="res"){cHash=foundRes; cArray=foundResColor; cMess="¡ÜÅÌXFððµÜ·©H";}
200		- else {cHash=highlight;cArray=highlightColor;cMess="¡ÜÅÌnCCgððµÜ·©H";}
201		- var i=0; while(cHash[cArray[i]].word){
202		- i++; if(i==cArray.length){if(confirm(cMess)){clearColor(type);i=0;break}else{i=null;break}}
203		- }
204		- return(cArray[i]);
	114	+// ID\|bvAbv
	115	+function searchPopup(obj){
	116	+ var objs=document.getElementsByTagName(obj.tagName);
	117	+ var reg=getID(obj);if(!reg){return}
	118	+ var target=idHash[reg].split(" ");
	119	+ if(target.length==1){return}
	120	+ if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:";
	121	+ var targetString=""; for(i in target){targetString+=returnString(target[i])} //gÌØèoµ
	122	+ if(targetString){popup(targetString);}else{obj.href=obj.rel;} //ÎÛª¶Ýµ½çrelÉÞðµÄ\|bvAbv
205	123	}
206		-// FðinbVAÎÛAfoundPanelj
207		-function clearColor(type,color){
208		- var cHash=(type=="res")?foundRes:highlight;
209		- if(event && event.altKey){color=""}
210		- for(var i in cHash){
211		- if(type=="res"){
212		- if(color && i!=color){continue} // wèFÅÈ¯êÎX[
213		- for(var j in cHash[i]){
214		- if(event.srcElement.value=="DEL"){removeRes(getDTfromAnc(cHash[i][j]))}else{toggleResColor(getDTfromAnc(cHash[i][j]))}
215		- }
216		- cHash[i]=new Array();
217		- document.getElementById("c"+i).removeNode(true);
218		- }else{
219		- var strongs=document.getElementsByTagName("STRONG");
220		- var reg=new RegExp(i);
221		- if(!color.match(i)){continue} // wèFÅÈ¯êÎX[
222		- for(var j=0;j<strongs.length;j++){
223		- if(strongs[j].style.backgroundColor==i){
224		- if(event.srcElement.value=="DEL"){removeRes(strongs[j].parentElement.previousSibling);j--}else{strongs[j].removeNode(false);j--}
225		- }
226		- }
227		- cHash[i]=new Array();
228		- if(document.getElementById("c"+i)){document.getElementById("c"+i).removeNode(true);} // and,orõÅPFÚÌÝ
	124	+// ¼OÌõEí
	125	+function search(obj){
	126	+ var singleColor=event.altKey;
	127	+ var objs=document.getElementsByTagName(obj.tagName);
	128	+ var reg=obj.innerText; var target="objs[i].innerText"; //¼OEgbv
	129	+ var decoy=obj.parentElement ? obj.parentElement : obj;
	130	+ if(!decoy.id.match(/^COLOR/)){
	131	+ // J[Ið
	132	+ var c = singleColor ? 0 : selectColor();
	133	+ if (c=="restart"){c=0;singleColor=true}
	134	+ else if(c=="exit"){return;}
	135	+ // õ
	136	+ var found=new Array; var l=objs.length;
	137	+ for(var i=l;i--;){
	138	+ var dt=objs[i].parentElement; if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
	139	+ if(eval(target)==reg){activate(dt,c);found.unshift(dt.firstChild.innerText);}
	140	+ else if(singleColor) {deactivate(dt)}
229	141	}
230		- }
231		- if(!fp.hasChildNodes()){fp.style.visibility="hidden";searched=false;}
232		-}
233		-// XFgO
234		-function toggleResColor(dt,c){
235		- if(!dt){return} // for-inÅçêéÔÈOÌobjÈçI¹
236		- if(c){
237		- dt.rev=dt.style.backgroundColor;
238		- dt.rel="colored";
239		- dt.id ="COLOR"+c.replace(/#/,"");
240		- dt.style.backgroundColor=c;
	142	+ foundReturn(found);
241	143	}else{
242		- dt.style.backgroundColor=dt.rev;
243		- if(dt.id.match(/COLOR/)){dt.removeAttribute("id")}//else{alert("dtÉCOLOR***ÈOÌidi"+dt.id+"jªÝè³êÄ¢Ü·")}
244		- dt.removeAttribute("rev");
245		- dt.removeAttribute("rel");
	144	+ clearResult(obj);return;
246	145	}
247	146	}
248		-// õÊÉîÃ«Á
249		-function removeRes(dt){if(!dt){return} // cHash[i][j]=ID:xxxxxxxxÌÆ«
250		- if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;} // LiveÌÝ-§¾ Ú`ñ
251		- dt.nextSibling.removeNode(true);dt.removeNode(true);
	147	+
	148	+// ID¶ñÌo
	149	+//var regID=new RegExp("ID:(.*)$");
	150	+var regID=new RegExp(".?\\s.?\\s.:(.?)(\\s\|$)"); // HOSTâçµ½çÎàÂ\ÉµÄÝé
	151	+function getID(obj){
	152	+ if(regID.test(obj.innerText)){return(RegExp.$1)}else{return(false)}
	153	+}
	154	+// FÝè
	155	+function activate(obj,c){
	156	+ var color=foundColor[c];
	157	+ obj.rev=obj.style.backgroundColor;
	158	+ obj.style.backgroundColor=color;
	159	+ obj.id="COLOR"+c; // ¯êidª¡¶¶éªByNameÅÍdtÌname©çæ¾Å«È¢½ßâÞÈµ
252	160	}
253		-//==========Ê\¦
254		-// XÔXgi\|bvAbvAJ[ðÜÞj
255		-function returnFound(type,color){
256		- var cHash=(type=="res")?foundRes:highlight;
257		- var nDIV="";var numArray=cHash[color[0]]; var display=new Array(["none","POP"],["inline","LST"]);
258		- if(searchView=="resPopup" \|\| numArray.length>=listLimit){display=display.reverse();}
259		- // \|bvAbv
260		- var nTT="";for(var i=0;i<color.length;i++){nTT+='<tt style="background-color:'+color[i]+'"> '+cHash[color[i]].word+'</tt>';}
261		- nDIV+='<span rel="'+type+'" style="display:'+display[0][0]+'">'+nTT+'</span>';
262		- // Xg
263		- var nA="";for(var i=0;i<numArray.length;i++){nA+=addAnchor(numArray[i],numArray[i])+" "}
264		- nDIV+='<tt style="background-color:'+color[0]+'" style="display:'+display[1][0]+'"> '+nA+'</tt>';
265		- // Â
266		- nDIV+=' '+numArray.length+' ';
267		- var buttons='<input type="button" value="'+display[0][1]+'" onclick="changeSearchView();blur()"><input type="button" value="É" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ºÖõ"><input type="button" value="È" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ãÖõ"><input type="button" value="CLR" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Altº\nFXSÄ"><input type="button" value="DEL" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Altº\nFXSÄ">';
268		- fp.innerHTML+='<div id="c'+color[0]+'">'+nDIV+buttons+'</div>';
269		- fp.style.visibility="visible";searched=true;
	161	+// FA
	162	+function deactivate(obj){if(!obj){return}
	163	+ obj.style.backgroundColor=obj.rev;
	164	+ if(obj.id!="sizeinfo"){obj.removeAttribute("id");}
	165	+ obj.removeAttribute("rev");
	166	+ obj.removeAttribute("title");
270	167	}
271		-// ÎÛXÉWv
272		-var markedDT;
273		-function moveToSearchRes(type,color){
274		- if(color.match(/(.*?),/)){color=RegExp.$1}
275		- var scope = (event && event.srcElement.value=="È") ? false : true ;
276		- var numArray= (type=="res") ? foundRes[color] : highlight[color];
277		- if(isNaN(numArray.justMovedRes)){numArray.justMovedRes=0}
278		- else{
279		- markedDT.style.borderColor="#999";
280		- if(scope){numArray.justMovedRes++;if(numArray.justMovedRes>=numArray.length){numArray.justMovedRes--;alert("±êæèºÉÍ èÜ¹ñ")}}
281		- else {numArray.justMovedRes--;if(numArray.justMovedRes<0){numArray.justMovedRes++;alert("±êæèãÉÍ èÜ¹ñ")}}
	168	+// J[Ið
	169	+function selectColor(){
	170	+ var c=0;
	171	+ while(document.getElementById("COLOR"+c)){
	172	+ c++;
	173	+ if(!foundColor[c]){if(confirm("Fðú»µÜ·©H")){return("restart")}else{return("exit")}}
282	174	}
283		- markedDT=getDTfromAnc(numArray[numArray.justMovedRes]); markedDT.style.borderColor="red";
284		- markedDT.scrollIntoView(true);
285		- setTimeout('markedDT.style.borderColor="#999"',5000);
	175	+ return(c);
286	176	}
287		-// \|bvAbvÆXg\¦ØèÖ¦
288		-function changeSearchView(){
289		- var e=event.srcElement;
290		- if(e.value=="POP"){
291		- e.value="LST";
292		- e.parentElement.childNodes[0].style.display="inline";
293		- e.parentElement.childNodes[1].style.display="none";
	177	+// Ê\¦
	178	+function foundReturn(found){
	179	+ if(!fR){document.body.insertAdjacentHTML('afterBegin','<div id="foundResult"></div>');fR=document.getElementById("foundResult");}
	180	+ //dtÌtitleÉ
	181	+ for(var i=found.length;i--;){dt=getDTfromAnc(found[i]);dt.title=found.join(" ");}
	182	+ //foundResultÉ
	183	+ var buttons='<input type="button" value="CLR" onclick="clearResult(this)" title="Altº\nFXSÄ"><input type="button" value="DEL" onclick="clearResult(this)" title="Altº\nFXSÄ">';
	184	+ if(found.length>=20 && confirm("20Èã é¯Ç\¦·éH")==false){
	185	+ fR.innerHTML=buttons; fR.title=found.join(" ");
294	186	}else{
295		- e.value="POP";
296		- e.parentElement.childNodes[0].style.display="none";
297		- e.parentElement.childNodes[1].style.display="inline";
	187	+ for(var i=0;i<found.length;i++){found[i] = addAnchor(found[i],found[i])}
	188	+ fR.innerHTML=found.join(" ")+buttons;
298	189	}
	190	+ fR.style.visibility="visible";
299	191	}
300		-
301		-//==========Pêõ
302		-function findIt(arg){createSearchPanel(arg);}
303		-var searchWindow=null;
304		-// õEBhEÌ\¦
305		-function createSearchPanel(arg){ // êpuEUÅÌmodelessDialogÖÌOÇÝÝÅÍAdialogArgumentsªêÈ¢ÌÅ¼Ú«o·
306		- if(arg){word=arg}
307		- if(searchWindow && !searchWindow.closed){return}
308		- var skinPath=document.getElementsByName("SkinPath")[0].content;
309		- searchWindow=showModelessDialog("",window,'dialogWidth:500px;dialogHeight:200px;dialogTop:0px;dialogLeft:0px;help:no;resizable:yes;status:no;unadorned:yes;');
310		- var nWin='<html><head><title>PêÌõ<\/title>'
311		- +'<script type="text/javascript">function submitEvent(){var fo=document.forms[0]; dialogArguments.word=fo.word.value; var i=-1;do{i++;dialogArguments.expression =fo.expression[i].value;}while(!fo.expression[i].checked); var i=0; while(fo.searchTarget[i]){dialogArguments.searchTarget[fo.searchTarget[i].value]=fo.searchTarget[i].checked;i++;} var i=-1;do{i++;dialogArguments.searchView =fo.searchView[i].value;}while(!fo.searchView[i].checked); dialogArguments.searchWord();}</script>'
312		- +'<style type="text/css">body{background:ThreeDFace;padding:0.5em;overflow:auto} fieldset{padding:0.5em;margin-top:0.5em;} legend,label,input{font:message-box;}</style>'
313		- +'<\/head><body onunload="unloadEvent()"><form onsubmit="submitEvent();return false;"><table width="100%"><tr><td valign="top" colspan="3">'
314		- +'<label for="word">õ¶ñF</label><input type="text" name="word" id="word" size="50" value="'+word+'" tabindex="0"><br>'
315		- +'</td><td align="right" valign="top" rowspan="2">'
316		- +'<input type="submit" name="submit" value="@@õ@" tabindex="7"><br><br><input type="button" name="cancel" value="LZ" onclick="window.close()" tabindex="8">'
317		- +'</td></tr><tr valign="top">'
318		- +'<td><fieldset><legend>õû@</legend><input type="radio" name="expression" value="default" id="tDef" tabindex="1"> <label for="tDef">Êíõ</label><br><input type="radio" name="expression" value="regExp" id="tReg"> <label for="tReg">³K\»</label><br><input type="radio" name="expression" value="multiAND" id="tAND"> <label for="tAND">ANDõ</label><br><input type="radio" name="expression" value="multiOR" id="tOR"> <label for="tOR">ORõ</label></fieldset></td>'
319		- +'<td><fieldset><legend>õÎÛ</legend><input type="checkbox" name="searchTarget" value="name" id="tName" tabindex="2" checked> <label for="tName">¼O</label><br><input type="checkbox" name="searchTarget" value="mail" id="tMail" tabindex="3" checked> <label for="tMail">[</label><br><input type="checkbox" name="searchTarget" value="id" id="tID" tabindex="4" checked> <label for="tID">útÆID</label><br><input type="checkbox" name="searchTarget" value="mess" id="tMess" tabindex="5" checked> <label for="tMess">{¶</label></fieldset></td>'
320		- +'<td><fieldset><legend>Ê\¦</legend><input type="radio" name="searchView" value="resList" id="rList" tabindex="6"> <label for="rList">XÔð\¦</label><br><input type="radio" name="searchView" value="resPopup" id="rPop"> <label for="rPop">Xð\|bvAbv</label><br><input type="radio" name="searchView" value="resJump" id="rJump"> <label for="rJump">XÖWv</label></fieldset></td>'
321		- +'</tr></table></form><\/body><\/html>';
322		- searchWindow.document.write(nWin);
323		- sdf=searchWindow.document.forms[0]; sdf.elements[0].select();
324		- var ex=sdf.expression;for(var i=0;i<ex.length;i++){if(ex[i].value==expression){ex[i].checked=true}}
325		- var sv=sdf.searchView;for(var i=0;i<sv.length;i++){if(sv[i].value==searchView){sv[i].checked=true}}
326		- range=document.body.createTextRange();
327		-}
328		-// õC
329		-var word="";var range;var searchTarget={"word":true};
330		-function searchWord(){
331		- if(!word){return}
332		- var matchs=new Array(); var color=new Array();
333		- // õû@
334		- if(expression=="regExp" \|\| expression=="default" \|\| (expression.match(/multi/) && !word.match(/\s/))){ // AND/ORÅêPêÈçdefaultÅõ
335		- // õêwèid¡rÅ¬»Hj
336		- if(expression=="regExp"){
337		- var regWord=word.replace(/[\^\$]/g,"");
338		- var reg=new RegExp(regWord,"g"); var tmpArr=range.text.match(reg); var tmp;
339		- if(!tmpArr \|\| !tmpArr.length){tmpArr=new Array(tmpArr)} // õÊ0or1ÈçAzñì¬
340		- tmpArr.sort();for(var i=0;i<tmpArr.length;i++){if(tmp!=tmpArr[i]){matchs.push(tmpArr[i])}tmp=tmpArr[i]}
341		- if(!matchs \|\| !matchs.length){matchs[0]=word} // õÊ0or1ÈçAzñì¬
342		- }else{matchs[0]=word}
343		- // nCCg
344		- for(var i=0;i<matchs.length;i++){color.push(setHighlight(matchs[i]));}
345		- highlight[color[0]].word=word;
	192	+// ÊÁAÊí
	193	+function clearResult(obj){
	194	+ var fromObj=obj.parentElement;
	195	+ var singleColor=event.altKey;
	196	+ var result=new Array();var arrayElement; var numbers=fromObj.title ? fromObj.title : fromObj.innerText;
	197	+ if(singleColor){result=dts; arrayElement="result[i]";}
	198	+ else {result=numbers.split(" ");arrayElement="getDTfromAnc(result[i])";}
	199	+ var l=result.length;
	200	+ if(!result[0]){
	201	+ /* õÊ[ÅàresultªnullÉÈçÈ¢Îô */
	202	+ }else if(event.srcElement.value!="DEL"){
	203	+ for(var i=l;i--;){
	204	+ var dt=eval(arrayElement);
	205	+ deactivate(dt);
	206	+ }
346	207	}else{
347		- // õêwè
348		- var matchs=word.split(" "); var tmpArr=new Array(); var tmp;
349		- // nCCg¨d¡
350		- for(var i=0;i<matchs.length;i++){
351		- color.unshift(setHighlight(matchs[i]));
352		- highlight[color[0]].word=matchs[i];
353		- tmpArr=tmpArr.concat(highlight[color[0]])
	208	+ for(var i=l;i--;){
	209	+ var dt=eval(arrayElement); var dd=dt.nextSibling;
	210	+ //Live@\ÇÁ - §¾ Ú`ñ
	211	+ if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;}
	212	+ dt.removeNode(true); dd.removeNode(true);
354	213	}
355		- color.reverse();tmpArr.sort();createHash(highlight,color[0],"",matchs[0]); // êUú»
356		- var judge = (expression=="multiAND") ? "tmp==tmpArr[i]" : "tmp!=tmpArr[i]";
357		- for(var i=0;i<tmpArr.length;i++){if(eval(judge)){highlight[color[0]].push(tmpArr[i])}tmp=tmpArr[i]} // õÊÍhighlight[color[0]]Éüêé
358	214	}
359		- // Ê\¦
360		- if (searchView=="resList") {returnFound("search",color);searchWindow.close();}
361		- else if(searchView=="resPopup"){returnFound("search",color);searchWindow.close();}
362		- else if(searchView=="resJump") {returnFound("search",color);searchWindow.close();if(highlight[color[0]].length){moveToSearchRes("search",color.join(","))}}
	215	+ if(fR){fR.innerText="";fR.style.visibility="hidden";}
363	216	}
364		-// nCCgõ
365		-function setHighlight(reg){
	217	+
	218	+//==========Pêõ
	219	+function findIt(word){
	220	+ if(!word){
	221	+ var word = prompt("õ·é¶ðüÍµÄ¾³¢B","");
	222	+ word = unescape(escape(word).split("%00")[0]); //IE5ÌoOÎô
	223	+ }
	224	+ if(!word \|\| word=="null"){return}
366	225	// J[Ið
367		- var c=selectColor("highlight"); if(!c){return}
	226	+ var singleColor=event.altKey;
	227	+ var c = singleColor ? 0 : selectColor();
	228	+ if (c=="restart"){c=0;singleColor=true}
	229	+ else if(c=="exit"){return;}
368	230	// õ
369		- while(range.findText(reg)){
370		- var dt=range.parentElement();var tag=dt.tagName; var thisRange;
371		- // õÎÛÅièÝ
372		- if(tag=="B"\|\|tag=="U"){thisRange="name"}
373		- else if(tag=="DT") {thisRange="mail"}
374		- else if(tag=="SPAN") {thisRange="id"}
375		- else if(tag=="DD" \|\| tag=="A" && dt.parentElement.tagName=="DD"){thisRange="mess"}
376		- else if(tag=="STRONG"){thisRange="word"}
377		- else{/alert("tagF"+tag+"\ndt:"+dt.outerHTML);/range.collapse(false);continue;} // XÔ(A)âõÊ©Ì(TT)
378		- if(!searchTarget[thisRange]){range.collapse(false);continue;}
379		- // ³K\»ÌÊuwèqª éêAïÜvfàÅÄõ
380		- if(expression=="regExp" && word.match(/[\^\|\$]/)){
381		- var thisReg=new RegExp(word); var targetText=(tag=="STRONG") ? dt.parentElement.innerText : dt.innerText;
382		- if(!targetText.match(thisReg)){range.collapse(false);continue}
383		- }
384		- // dtæ¾¨XÔæ¾¨nCCg
385		- if(dt.tagName!="DT"){
386		- while(dt.tagName!="DT" && dt.tagName!="DD"){dt=dt.parentElement}
387		- if(dt.tagName=="DD"){dt=dt.previousSibling}
388		- }
389		- var num=dt.firstChild.innerText;
390		- if(dt.parentElement.className!="refResult" && num!=highlight[c][highlight[c].length-1]){highlight[c].push(num)} // tQÆàÌDT,¯êÔÈçñð
391		- range.pasteHTML('<strong style="background-color:'+c+'">'+range.text+'</strong>');
392		- range.collapse(false);
	231	+ var found=new Array; var l=dds.length;
	232	+ var bodyText=document.body.createTextRange();
	233	+ for(var i=l;i--;){
	234	+ var dt=dts[i]; var dd=dds[i]; if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
	235	+ bodyText.moveToElementText(dt); var checkDT=bodyText.findText(word,0);
	236	+ bodyText.moveToElementText(dd); var checkDD=bodyText.findText(word,0);
	237	+ if(checkDT \|\| checkDD){activate(dt,c);found.unshift(dt.firstChild.innerText)}
	238	+ else if(singleColor) {deactivate(dt);}
393	239	}
394		- range=document.body.createTextRange(); // Wð³ÉßµÄ¨
395		- return(c);
	240	+ if(found){foundReturn(found)}
396	241	}
397	242	//==========tQÆ
398	243	function searchRef(obj){

		@@ -400,7 +245,16 @@ function searchRef(obj){
400	245	var num=obj.firstChild.innerText;
401	246	if(refHash[num]){
402	247	var refArr=refHash[num].split(/\s/); var refs="";
403		- for(var i=0;i<refArr.length;i++){refs+=returnString(refArr[i]);}
	248	+ for(var i=0;i<refArr.length;i++){
	249	+ var dtOrg=getDTfromAnc(refArr[i]); var dt=dtOrg.cloneNode(true); var dd=dtOrg.nextSibling.cloneNode(true);
	250	+ // {¶ÈOðí
	251	+ if(dd.lastChild){
	252	+ if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true);} //tQÆÌ
	253	+ if(dd.lastChild.name){dd.lastChild.removeNode(true);} // LABELNUMBERªÈ¢àÌÉWésvAJ[Ì
	254	+ }
	255	+ // {¶ði[
	256	+ refs+=dt.outerHTML.replace(/name=.?>/,">")+dd.outerHTML.replace(/<a name=.>/i,"");
	257	+ }
404	258	obj.nextSibling.insertAdjacentHTML("beforeEnd",'<dl class="refResult">'+refs+'</dl>')
405	259	obj.name="referred";
406	260	}

		@@ -428,26 +282,9 @@ function getDTfromAnc(num){
428	282	var anc=ancs(anchorHead+num);
429	283	if(!anc){return("")} //LABELNUMBERÎÌ Ú`ñáµÍ¢oÔÈçI¹
430	284	var obj=anc.parentElement; //LABELNUMBERÎÌàÌ
431		- if(!obj \|\| !obj.tagName){return false;}
432	285	if(obj.tagName!="DT"){ //LABELNUMBERñÎÌàÌ
433	286	if(num==1){if(anc){obj=anc.nextSibling} else{return("")}}
434	287	else {if(!anc.nextSibling){obj=anc.parentElement.nextSibling}else{return("")}}
435	288	}
436	289	return(obj);
437		-}
438		-
439		-// æÂÖA
440		-var regIMG=new RegExp(".?\\s.?\\s.:.?\\sIMG:(.*?)(\\s\|$)"); // æàÂ\ÉµÄÝé
441		-function getIMG(obj){
442		- if(regIMG.test(obj.innerText)){
443		- var filename=RegExp.$1;
444		- var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
445		- var today=new Date();var last=new Date(today-72460601000);var date="";
446		- date+=last.getMonth()<9 ? "0"+(last.getMonth()+1) : last.getMonth()+1;
447		- date+=last.getDate()<10 ? "0"+last.getDate() : last.getDate();
448		- var log= (RegExp.$1+""+RegExp.$2 < last.getYear()+""+date) ? "_kako/" : "_img/";
449		- var fileurl="http://up01.2ch.io/"+log+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
450		- return(fileurl)
451		- }else{return(false)}
452		-}
453		-
	290	+}
		\ No newline at end of file

--- a/res/skin/skin30-3G/Header.html

+++ b/res/skin/skin30-3G/Header.html

		@@ -15,7 +15,7 @@
15	15	var start_time = new Date();
16	16	//==========O[oÏ
17	17	var anchorHead="";
18		-var skinName="skin30-3 v3.6.1231";
	18	+var skinName="skin30-3 v3.5.0704";
19	19	var browser="MRir";
20	20	//==========MRirpAJ[Ì»èi0:³µ,1:\|bvAbv,2:{^}üj
21	21	// MRirÅÍAXAJ[ÍÎAhXÅLq³êé

		@@ -47,16 +47,6 @@ function threadurl(){
47	47	t_bbs=RegExp.$1;
48	48	t_key=RegExp.$2;
49	49	}
50		-//==========ñ\¦XÌ\¦-MRirÌÝ
51		-function hiddenRes(e){
52		- var number=tohan(event.srcElement.innerText.replace(/>\|/g,""));
53		- var i=0;while(document.anchors[i].name.match(/\D/)){i++}
54		- var startRes=parseInt(document.anchors[i+1].name.replace(/\D/g,""));
55		- if(number.match(/(\d)\D+(\d)/)){var start=parseInt(RegExp.$1);}
56		- else {var start=parseInt(number);}
57		- //alert(startRes+">"+start+" && "+start+"!="+1);
58		- if(startRes>start && start!=1){return true}else{return false}
59		-}
60	50	</script>
61	51	</head>
62	52	<body>

--- a/res/skin/skin30-3G/chie_base.css

+++ b/res/skin/skin30-3G/chie_base.css

		@@ -7,11 +7,8 @@ dt a{text-decoration:none;}
7	7	dd a{text-decoration:underline;line-height:1.1}
8	8
9	9	/* õÊ */
10		-#foundPanel{color:LightSlateGray;}
11		-#foundPanel div {font-family:"lr SVbN";}
12		-#foundPanel div span{font-family:Times;cursor:hand;}
13		-#foundPanel a {color:LightSlateGray;}
14		-#foundPanel a:hover{color:#000;}
	10	+#foundResult a {color:LightSlateGray;}
	11	+#foundResult a:hover{color:#000;}
15	12
16	13	/* dt */
17	14	dt{

--- a/res/skin/skin30-3G/chie_event.js

+++ b/res/skin/skin30-3G/chie_event.js

		@@ -1,22 +1,18 @@
1		-//========VWvÝè
2		-var buffer=1; // á¬ñüâá¬}VÌêÉÍbufferÌlðâ·Ææè³mÉWvi1â·Æ0.1bxêéj
3		-var newResJump=1; // VXWvi0:uEUC¹A1:Ç¹ÌÝA2:íj©¿ãAOpenJaneAtwintailÌÝÌÝè
4		-//==========ÈºÍXNvg{¶Å·æB
5	1	//Cxgnhè`
6	2	//OÖFtohan
7	3	//OÏFanchorHead,lightmode,getID,skinName,browser,dts
8		-//=========Ot@C¤pÌO[oÏ
9		-var waited=false;//command\¦ãtrueÉµAIðãÉfalseÉ·éB
10		-var viewed=false;//thumbÇÝãtrueÉµAthumbPanelÉæ~ãfalseÉ·éB
11		-var searched=false; //õãÉAtrueÉµAfoundPanelÉæ~ãfalseÉ·éB
12		-var cp,tp,vp,fp;
	4	+//O[oÏ
	5	+var buffer=1; // á¬ñüâá¬}VÌêÉÍbufferÌlðâ·Ææè³mÉWvi1â·Æ0.1bxêéj
	6	+var newResJump=1; // VXWvi0:uEUC¹A1:Ç¹ÌÝA2:íj©¿ãAOpenJaneAtwintailÌÝÌÝè
13	7	//========Click¨search,¼
14	8	document.onclick = clickEvent;
15	9	function clickEvent(){
16	10	if(clickCancel){return false}else{clearTimeout(clickTimer);if(document.getElementById("context")){document.getElementById("context").removeNode(true);}}
17	11	var obj=window.event.srcElement;
18	12	var tag=obj.tagName;
19		- if(tag=="B"\|\|tag=="U"\|\|tag=="SPAN"){searchPerson(obj)} //¼O,gbv,ID
	13	+ if (tag=="B") {search(obj.parentElement)} //¼O
	14	+ else if(tag=="U") {search(obj)} //gbv
	15	+ else if(tag=="SPAN"){if(getID(obj)){searchID(obj)}} //ID
20	16	else if(tag=="DT") {searchRef(obj)}
21	17	else if(tag=="DD") {defaultPopup()}
22	18	else if(tag=="A"){

		@@ -27,7 +23,7 @@ function clickEvent(){
27	23	if(obj.href.match(/^http:.*#/)){window.open(obj.href,"_parent");return false}
28	24	}
29	25	//A Boneâ³iñ\¦XÌ\¦j
30		- if((browser=="A Bone"\|\|browser=="MRir") && hiddenRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content.replace(/\/l50$/,"/")+tohan(obj.innerText.replace(/[>]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
	26	+ if(browser=="A Bone" && hidedRes(obj)){showModelessDialog(document.getElementsByName("ThreadURL")[0].content+tohan(obj.innerText.replace(/[>]/g,"")),window,"dialogWidth:"+document.body.clientWidth+"px;help:no;resizable:yes;status:no;unadorned:yes;");window.focus();}
31	27	//Jane,Live,MRirâ³iskin30-2NormalyÑMRirjXWvªscrollIntoViewÅÈ¢àÌÉWéâ³
32	28	if(browser=="A Bone" \|\| browser=="OpenJane" \|\| browser=="Live2ch" \|\| browser=="MRir"){if(obj.href.match(/^about\|jumpres/)){
33	29	var h=tohan(obj.innerText.replace(/[>]/g,""));

		@@ -36,17 +32,17 @@ function clickEvent(){
36	32	}}
37	33	return true;
38	34	}
39		- else{panelOver();return}
	35	+ else{return}
40	36	}
41	37
42	38	//=========MouseOver¨image,popup
43	39	document.onmouseover = mouseOverEvent;
44	40	function mouseOverEvent() {
45	41	var e = window.event.srcElement;
46		- if(e.tagName=='B'){if(browser!="twintail2"){
	42	+ if(e.tagName=='B'){
47	43	if(e.innerText.match(/^([^\dO-X])([\dO-X]+)([^\dO-X].*)/)){namePopup(e,RegExp.$1,RegExp.$2,RegExp.$3);}
48	44	else if(e.innerText.match(/^ Ú`ñ$/)) {abonePopup(e);}
49		- }}
	45	+ }
50	46	if(e.tagName=='A'){
51	47	if(!e.innerText.match(/%/)){ // URLGR[hÅ èª¿È%ªÈ¯êÎ
52	48	//e.href=e.href.replace(/>/g,"");

		@@ -59,8 +55,9 @@ function mouseOverEvent() {
59	55	}
60	56	}
61	57	if (checkAnchor(e.href)==2){insButton(e);return;}
62		- else if(checkAnchor(e.href)==1){ // ½i\|bvAbv
	58	+ else if(checkAnchor(e.href)==1){
63	59	if(event.shiftKey){if(e.rel){e.href=e.rel}return}
	60	+ // ½i\|bvAbv
64	61	var parent=e.parentElement;
65	62	var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText;
66	63	if(!document.getElementById("p"+aNum)){

		@@ -69,48 +66,49 @@ function mouseOverEvent() {
69	66	if(!onPopup){removePopup()}
70	67	makePopContent(e);return;
71	68	}
72		- }else if(checkAnchor(e.href)==0){ // tQÆ\|bvAbv
73		- if(e.href.match(/menu:/) && event.shiftKey){searchPopup(e)}
74	69	}
75		- }else if(e.tagName=="SPAN"\|\|e.tagName=="TT"){
76		- var obj=e;var onPopup;
77		- while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
78		- if(e.tagName=="SPAN"){
79		- if(!onPopup && event.shiftKey){searchPopup(e)}
80		- }else{searchPopup(e)}
81	70	}else{ // ½i\|bvAbvÁ
82	71	var obj=e;var onPopup;
83	72	if(obj.sourceIndex<0){obj=document.body;if(document.getElementById("popupBase")){onPopup=true;}} // namePopupÆÌ£Åm[hªOêéuÔÌñð
84		- while(obj.tagName!="BODY"){if(obj.id.match(/(p\d+)/)){onPopup=true;break}else{obj=obj.parentElement;}}
	73	+ while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement;}}
85	74	if(onPopup){while(obj.id!=obj.parentElement.lastChild.id){obj.parentElement.lastChild.removeNode(true)}}
86	75	else {removePopup()}
87	76	}
	77	+ if(e.tagName=="DT"){setHash();}
	78	+ if(e.tagName=="SPAN"){
	79	+ var obj=e;var onPopup;
	80	+ while(obj.tagName!="BODY"){if(obj.id.match(/p\d+/)){onPopup=true;break}else{obj=obj.parentElement}}
	81	+ if(!onPopup && event.shiftKey){searchPopup(event.toElement);} return;
	82	+ }
88	83	}
89		-//=========MouseMove¨panelOver()
	84	+//=========MouseMove¨menuOver(),tpOver()
90	85	document.onmousemove=mouseMoveEvent;
	86	+var waited=false;//command\¦ãtrueÉµAIðãÉfalseÉ·éB
	87	+var viewed=false;//thumbÇÝãtrueÉµAthumbPanelÉæ~ãfalseÉ·éB
	88	+var cp,tp,vp;
91	89	function mouseMoveEvent() {
92	90	if(!cp){
93		- var nHTML ='<div id="controlPanel"><input type="button" value="TOP" onclick="scroll_Top();blur()"><input type="button" value="END" onclick="scroll_End();blur()"><input type="button" value="IMG" onmouseup="imgCommand();blur()"><input type="button" value="FND" onclick="fndCommand();blur();"></div><div id="foundPanel" onmouseout="searched=false"></div>';
94		- if(skinName.match(/30-2/)){nHTML+='<div id="thumbPanel" onmouseout="viewed=false"></div><div id="viewPanel"></div>';}
95		- document.body.insertAdjacentHTML("afterBegin",nHTML);
96		- cp=document.getElementById("controlPanel");fp=document.getElementById("foundPanel");
97		- if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}else{tp=vp=new Object()}
98		- cp.condition="waited";tp.condition="vp.firstChild \|\| viewed \|\| !lightmode";fp.condition=resultView ? "fp.hasChildNodes()" : "searched";
99		- cp.territory="<25"; tp.territory=">20"; fp.territory="<(30+fp.clientHeight) && fp.hasChildNodes()";
	91	+ var nHTML ="<div id='controlPanel'><input type='button' value='TOP' onclick='scroll_Top();blur()'><input type='button' value='END' onclick='scroll_End();blur()'><input type='button' value='IMG' onmouseup='imgCommand();blur()'><input type='button' value='FND' onclick='findIt(document.selection.createRange().text);blur()'></div>";
	92	+ if(skinName.match(/30-2/)){nHTML+="<div id='thumbPanel' onmouseout='viewed=false'></div><div id='viewPanel'></div>";}
	93	+ document.body.insertAdjacentHTML('afterBegin',nHTML);
	94	+ cp=document.getElementById("controlPanel");
	95	+ if(skinName.match(/30-2/)){tp=document.getElementById("thumbPanel");vp=document.getElementById("viewPanel");}
100	96	}
101		- if(event){panelOver();}
102		- if(!idHash.length){setHash();searchColoring();}
	97	+ cpOver();
	98	+ tpOver();
103	99	}
104		-// epl
105		-function panelOver(){
	100	+// Rg[pl
	101	+function cpOver(){
106	102	var territoryW=document.body.clientWidth-120;var territoryH=25;
107		- var panels=new Array("cp","tp","fp");
108		- for(var i in panels){
109		- if(skinName.match(/30-3/)&&panels[i]=="tp"){continue}
110		- var panel=eval(panels[i]); var territoryY=eval("event.y"+panel.territory); var territoryX=eval(event.x>document.body.clientWidth-panel.offsetWidth-15);
111		- if(eval(panel.condition)){panel.style.visibility="visible";return}
112		- if(territoryY && territoryX){panel.style.visibility="visible";}else{panel.style.visibility="hidden";}
113		- }
	103	+ if(waited){cp.style.visibility="visible";return}
	104	+ if(event.y<territoryH && event.x>territoryW){cp.style.visibility="visible";}else{cp.style.visibility="hidden";}
	105	+}
	106	+// TlCpl
	107	+function tpOver(){
	108	+ if(skinName.match(/30-3/) \|\| !lightmode){return}
	109	+ var territoryW=document.body.clientWidth-120;var territoryH=20;
	110	+ if(document.getElementById("viewPanel").firstChild \|\| viewed){tp.style.visibility="visible";return}
	111	+ if(event.y>territoryH && event.x>territoryW){tp.style.visibility="visible";}else{tp.style.visibility="hidden";}
114	112	}
115	113	// TOP,END
116	114	function scroll_Top(){document.getElementsByTagName("DL")[0].firstChild.scrollIntoView(true);}

		@@ -129,14 +127,6 @@ function imgCommand(mode,s){
129	127	clearCommand();
130	128	}
131	129	}
132		-function fndCommand(mode,s){
133		- if(!waited){
134		- findIt(document.selection.createRange().text);
135		- event.cancelBubble=true;
136		- }else{
137		- clearCommand();
138		- }
139		-}
140	130	function clearCommand(){
141	131	waited=false;
142	132	document.getElementById("command").removeNode(true);

		@@ -184,7 +174,7 @@ function key(){
184	174	else if(code=="36"){scroll_Top()}
185	175	else if(code=="35"){scroll_End()}
186	176	else if(code=="73" && event.shiftKey){changePanel();return false;} // shift+I
187		- else if(code=="70" && event.shiftKey){findIt(document.selection.createRange().text);return false;} // shift+F
	177	+ else if(code=="70" && event.shiftKey){cp.childNodes[3].click();return false;} // shift+F
188	178	else if(code=="78" && event.shiftKey && firstNew){firstNew.scrollIntoView(true)} // shift+N
189	179	else if(code=="82" && event.shiftKey && event.ctrlKey){ // ctrl+shift+R
190	180	//©¿ã`µáâ³iÂXVÌV[gJbgL[j

		@@ -200,7 +190,7 @@ function key(){
200	190	//=========©¿ãAABoneA]kQ
201	191	var newResNum=parseInt(document.getElementsByName("GetRescount")[0].content)+1;
202	192	var k=0;
203		-function loadEvent(num){
	193	+function loadEvent(num){ //setTimeout("setHash();",100);
204	194	//====VXWv
205	195	if(newResJump==0){clearInterval(timerID);return} //uuEUC¹vÈçI¹
206	196	//VXÌJnÔðæ¾

		@@ -219,7 +209,7 @@ function loadEvent(num){
219	209	//=========VXæ¾ãiWXLÎuEUpj©NewMark©çÄÑoµ
220	210	//=========OpenJAtwin
221	211	var scr,viewPos,endPos=0;
222		-function reloadEvent(){
	212	+function reloadEvent(){ //setTimeout("setHash();",100);
223	213	//====ùÇ»
224	214	var lastDt=dts[dts.length-2];if(!lastDt){return}// SVÈçI¹
225	215	while(lastDt && lastDt.className=="new"){lastDt.className="";lastDt=lastDt.previousSibling.previousSibling;}

		@@ -252,10 +242,10 @@ function defaultPopup(){
252	242	obj.innerText=num;
253	243	obj.href="#"+hnum;
254	244	makePopContent(obj);
255		- }else if(num.match(/\w{8,9}/)){ //\w{8}ÅÍ¾ßÛH
256		- var obj=document.createElement("DT");
257		- obj.innerHTML="<span>date time ID:"+num+"</span>";
258		- searchPerson(obj.firstChild);
	245	+ }else if(num.match(/\w/) && num.length==8){ //\w{8}ÅÍ¾ßÛH
	246	+ var obj=document.createElement("span");
	247	+ obj.innerText="date time ID:"+num;
	248	+ setHash();searchID(obj);
259	249	}
260	250	}
261	251

		@@ -270,14 +260,5 @@ function copyEvent(){
270	260	copyText.execCommand("Copy");
271	261	return false;
272	262	}
273		-//=========onScroll
274		-//window.onscroll=function(){clearInterval(beforeScrollTimer);onLoadEvent()}
275		-window.onscroll=function(){onLoadEvent()}
276		-if(document.getElementById("dl")){
277		- document.getElementById("dl").onscroll=function(){onLoadEvent()}
278		-}
279		-//=========onLoad
280		-window.onload=onLoadEvent;
281		-function onLoadEvent(){mouseMoveEvent();setHash();searchColoring();}
282		-setTimeout("onLoadEvent()",1000); // êñ¾¯F
283		-
	263	+//=========onLoadiDAT2HTMLÌÝj
	264	+window.onload=function(){setHash()}

--- a/res/skin/skin30-3G/chie_image2.js

+++ b/res/skin/skin30-3G/chie_image2.js

		@@ -1,8 +1,7 @@
1	1	// CxgnhFonMouseover
2	2	// OÏFanchorHead,dds
3		-//======æÇÝÝÌÝè ijWindowsXP SP2ÅÍ±êçÌÝèÍLøÉ@\µÜ¹ñB
4		-var onOpenLoad =1; // 0:ÇÝÜÈ¢A1:VXÌÝA2:S
5		-var onMouseLoad=true; // true:J[\ðí¹½¾¯Afalse:LOAD{^ðNbNµÄ©ç
	3	+//======æÇÝÝÌÝè
	4	+var onMouseLoad=true; // true:J[\ðí¹½¾¯Afalse:LOAD{^ðNbNµÄ©ç
6	5	//==========O[oÏ
7	6	var lightmode=true; // Live,twinÌWvp»èÅp¢Ä¢éÌÅK{
8	7	//==========æ

--- a/res/skin/skin30-3G/chie_popup.js

+++ b/res/skin/skin30-3G/chie_popup.js

		@@ -1,6 +1,4 @@
1		-//==========ÈºÍXNvg{¶Å·æB
2	1	// CxgnhFonMouseover
3		-// OÏFidHash,refHash,foudRes,highlight
4	2	// OÖFaddAnchor,getDTfromAnc
5	3	// Á¥FDIV#popupBaseºÉutbgÅjAvÉDL#p\dðì¬·éB
6	4	//==========CSSÌoÍ

		@@ -11,65 +9,65 @@ nCSS+='#popupBase dl{position:absolute; background-color:window; border:outset 1
11	9	nCSS+='#popupBase dt span{float:none; margin-left:1em;}';
12	10	nCSS+='#popupBase dd{margin:auto 1em}';
13	11	document.write('<style type="text/css">'+nCSS+'</style>\n');
14		-//=========Ot@C¤pÌO[oÏ
	12	+//=========O[oÏ
	13	+var pb;
15	14	//=========io[È¼OÌ\|bvAbv
16	15	function namePopup(e,before,num,after){
17	16	var hnum=tohan(num);
18		- if(hnum==774 \|\| hnum==21 \|\| hnum==1 \|\| hnum==30){return} // Socket774A774KBA21ÖA[1-30]AÈÇÍ³
19		- if(before && before.match(/¼³/)){return} //¼³µÁÛ¢ÌÍ³
20		- if(after) {if(after=="üN"){return}} // ftHgÈ"üN"Í³
	17	+ //RüNASüNASocket774A774KBA21ÖA[1-30]AÈÇÍ³
	18	+ if(before){if(hnum==5 \|\| hnum==774 \|\| hnum==4 \|\| hnum==21 \|\| hnum==1 \|\| hnum==30){return}}
21	19	var nB = before ? "<b>"+before+"</b><b>":"<b>"; nB+=addAnchor(hnum,num); nB+=after ? "</b><b>"+after+"</b>":"</b>";
22	20	e.outerHTML=nB;
23	21	}
24	22	//=========ã Ú`ñÌ\|bvAbv
25		-function abonePopup(e){e.outerHTML = "<b>"+addAnchor(e.parentElement.previousSibling.innerText,' Ú`ñ')+"</b>";}
26		-//=========õµ½XÌ\|bvAbv
27		-function searchPopup(obj){
28		- var reg,cArray;var tag=obj.tagName;
29		- /ref Popup/if (tag=="A") {if(refHash[obj.innerText]){cArray=refHash[obj.innerText].split(" ")}else{return}}
30		- /ID Popup/ else if(tag=="SPAN"){reg=getID(obj);if(reg&&reg.length>3){cArray=idHash[reg].split(" ");}else{return} if(cArray.length==1){return}}
31		- /õPopup/else if(tag=="TT") {var cHash=(obj.parentElement.rel=="res")?foundRes:highlight;cArray=cHash[obj.parentElement.firstChild.style.backgroundColor];if(!cArray){return}}
32		- var targetString=""; for(var i=0;i<cArray.length;i++){targetString+=returnString(cArray[i]);} //gÌØèoµ
33		- if(targetString){popup(targetString);} //ÎÛª¶Ýµ½ç\|bvAbv
	23	+function abonePopup(e){
	24	+ var hnum=e.parentElement.previousSibling.innerText;
	25	+ e.outerHTML = "<b>"+addAnchor(hnum,' Ú`ñ')+"</b>";
34	26	}
35	27	//=========½i\|bvAbv
36	28	//E\|bvAbvÌì¬
	29	+var startRes;
37	30	function makePopContent(obj){
38	31	//Oõ
39		- var num=obj.innerText.replace(/[>]/g,""); var number=tohan(num);
40		- if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:"; // uEU{ÌÌ\|bvAbvñð
41		- //Ô²¸
	32	+ var num=obj.innerText.replace(/[>]/g,"");
	33	+ var number=tohan(num);
	34	+ if(!obj.rel){obj.rel=obj.href;}
	35	+ obj.href="decoy:";
	36	+ //²¸
	37	+ if(document.anchors.length==1){return} //Xª1ÈçI¹
	38	+ if(!startRes){startRes=parseInt(document.anchors[1].name.replace(/\D/g,""))}
42	39	if(number.match(/(\d)\D+(\d)/)){var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);}
43	40	else {var start=end=parseInt(number);}
44		- if(end-start>100){end=start+100} // 100Èã\¦µÈ¢
	41	+// alert(startRes+">"+end+" && "+end+"!=1")
	42	+ if(startRes>end && end!=1){obj.href=obj.rel;return}//¶ÝµÄ¢È¯êÎI¹
45	43	//gÌØèoµ
46		- var targetString=""; for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}
	44	+ var targetString=""; if(end-start>100){end=start+100}
	45	+ if(start==end){targetString=returnString(start)}
	46	+ else {for(var i=0;i<=end-start;i++){targetString+=returnString(start+i)}}
47	47	//ÎÛª¶Ýµ½çrelÉÞðµÄ\|bvAbv
48	48	if(targetString){popup(targetString);}else{obj.href=obj.rel;}
49	49	}
50	50	//EgÌØèoµ
51	51	function returnString(num){
52	52	var obj=getDTfromAnc(num);
53		- setSearchColor(obj);//\|bvAbvæÌF
54	53	if(!obj){return("")} //ÎÛª§¾ Ú`ñÈçI¹
55		- var dt=obj.cloneNode(true);
56		- var dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBERÎÌàÌÉWéNAJ[Ì
57		- var dd=obj.nextSibling.cloneNode(true);
	54	+ var dt,dd,dtOuter,ddOuter;
	55	+ dt=obj.cloneNode(true);
	56	+ dtOuter=dt.outerHTML.replace(/name=.*?>/,">"); // LABELNUMBERÎÌàÌÉWéNAJ[Ì
	57	+ dd=obj.nextSibling.cloneNode(true);
58	58	if(dd.hasChildNodes()){
59	59	while(dd.lastChild.name){dd.lastChild.removeNode(true)} // LABELNUMBERñÎÌàÌÉWéNAJ[Ì
60	60	if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true)} // tQÆÌ
61	61	}
62		- var ddOuter=dd.outerHTML;
	62	+ ddOuter=dd.outerHTML;
63	63	return(dtOuter+ddOuter);
64	64	}
65	65	//E\|bvAbv
66		-var pb;
67	66	function popup(inner){
68	67	if(!pb){document.body.insertAdjacentHTML('afterBegin','<div id="popupBase"></div>');pb=document.getElementById("popupBase")}
69	68	//vfÌì¬
70	69	var parent=event.srcElement.parentElement;
71		- //var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDÈO¼OAæAIDõ
72		- var aNum=event.srcElement.sourceIndex;if(!aNum){alert("aNumæ¾G[")}
	70	+ var aNum= (parent.tagName!="DD") ? parent.firstChild.sourceIndex : parent.previousSibling.firstChild.innerText; // DDÈO¼OAæAIDõ
73	71	if(document.getElementById('p'+aNum)){return} // \|bvAbvµÄ½çI¹
74	72	pb.insertAdjacentHTML("beforeEnd",'<dl id="p'+aNum+'">'+inner+'</dl>');
75	73	//vfÌzu

		@@ -77,16 +75,16 @@ function popup(inner){
77	75	// y²²®
78	76	var pos=Math.min(event.y,document.body.clientHeight-event.y);
79	77	var scTop=document.body.scrollTop+event.y;
80		- if(pos==event.y){var y=scTop-30;} // J[\ÌºÖ\¦
81		- else {var y=scTop+10-p.clientHeight;} // J[\ÌãÖ\¦
	78	+ if(pos==event.y){var y=scTop-30;} // º
	79	+ else {var y=scTop+10-p.clientHeight;} // ã
82	80	if(y<0){y=0}
83		- if(event.srcElement.parentElement.tagName=="TT"){y+=35;}
	81	+ if(event.srcElement.parentElement.id=="foundResult"){y+=30}
84	82	p.style.pixelTop=y;
85	83	// x²²®
86	84	var pos=Math.min(event.x,document.body.clientWidth-event.x);
87	85	var scLeft=document.body.scrollLeft+event.x;
88		- if(pos==event.x){var x=scLeft-2} // J[\ÌEÖ\¦
89		- else {var x=scLeft-4-p.clientWidth;} // J[\Ì¶Ö\¦
	86	+ if(pos==event.x){var x=scLeft-2} // E
	87	+ else {var x=scLeft-4-p.clientWidth;} // ¶
90	88	if(x<0){x=0}
91	89	p.style.pixelLeft=x;
92	90	// ³²®iscrollBarðv·êÆvµÈ¢êª éj¨y²²®

--- a/res/skin/skin30-3G/chie_search.js

+++ b/res/skin/skin30-3G/chie_search.js

		@@ -1,398 +1,243 @@
1		-beID=false; // beÉOCoéêÍAtrue
2		-//==========õÝè
3		-var expression="multiAND"; // õû@@@default:WAregExp:³K\»AmultiAnd:ANDõAmultiOR:ORõ
4		-var searchView="resList"; // õÊ\¦@@resList:YXÔ\¦AresPopup:YX\|bvAbvA
5		-var resultView=false; // õÊÌí\¦@@true:í\¦Afalse:}EXÅßÃ¯½Æ«ÌÝ\¦
6		-var listLimit =10; // searchViewªresPopupÅÈ¢êÌAXÔÌ\¦§À
7		-//==========XÔAút¶ñÌFÝè
8		-coloring=1; // F·é:1@FµÈ¢:0
9		-threshold1=[2,"#0000ff"]; // «Ýª¡ éID Ìµ«¢lÆF
10		-threshold2=[5,"#aaaa00"]; // «Ýª½ éID Ìµ«¢lÆF
11		-threshold3=[8,"#ff0000"]; // «Ýª½ éID Ìµ«¢lÆF
12		-threshold4=[1,"#0000FF"]; // «Ýª é X Ìµ«¢lÆXÔÌF
13		-threshold5=[4,"#aaaa00"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
14		-threshold6=[7,"#ff0000"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
15		-//==========¼OEIDõÉæéXÌÑÌFwèi16iÍWeb`®ÌF¼ÅwèB¢ÂÅàÂBAt@xbgÍ¬¶Å¨è¢j
16		-var foundResColor =new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
17		-//==========PêõÉæénCCgFwèi¯ãj
18		-var highlightColor=new Array("#ffff66","#a0ffff","#99ff99","#ff9999","#ff66ff","#880000","#00aa00","#886800","#004699","#990099");
19		-//==========ÈºÍXNvg{¶Å·æB
20		-// CxgnhFonClick,onScroll,onMousemove
21		-// OÖFaddAnchor,checkAnchor,tohan,searchPopup
22		-// OÏFanchorHead,browser,fp
23		-// tQÆÌÁ¥FCxg¶DTÉÎ·éDDºÉADL-DT-DD\¢ðì¬·éB
	1	+// út¶ñÌFÝè@F·é:1@FµÈ¢:0
	2	+coloring=1;
	3	+threshold1=[2,"#0000FF"]; // «Ýª¡ éID Ìµ«¢lÆF
	4	+threshold2=[5,"#FF0000"]; // «Ýª½ éID Ìµ«¢lÆF
	5	+threshold3=[1,"#0000FF"]; // «Ýª é X Ìµ«¢lÆXÔÌF
	6	+threshold4=[4,"#FF0000"]; // «Ýª½ éX Ìµ«¢lÆXÔÌF
	7	+// CxgnhFonClick
	8	+// OÖFaddAnchor,checkAnchor,tohan
	9	+// OÏFanchorHead,browser
	10	+// Á¥FCxg¶DTÉÎ·éDDºÉADL-DT-DD\¢ðì¬·éB
24	11	//==========CSSÌoÍ
25	12	var nCSS='';
26		-nCSS+='#foundPanel {position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999;visibility:hidden}';
27		-nCSS+='#foundPanel div{padding-left:5px;text-align:right;font-size:100%;}';
	13	+nCSS+='#foundResult{position:absolute;top:expression(body.scrollTop+25);right:18px;padding:2px 5px;z-index:6;background-color:white;border:1px solid #999}';
28	14	nCSS+='.refResult{margin:0.5em 0.3em; border:1px solid #666;padding-right:0px}';
29	15	nCSS+='.refResult{border-top:none}';
30	16	nCSS+='.refResult dt{margin-right:0px;}';
31	17	nCSS+='.refResult dd{margin-left:0.8em;}';
32	18	document.write('<style type="text/css">'+nCSS+'</style>\n');
	19	+//==========õÉæéFwèi16iÍWeb`®ÌF¼ÅwèB¢ÂÅàÂj
	20	+var foundColor = new Array("#ffdfee","#eeffdf","#ffeedf","#dfffee","#eedfff","#ffffe1");
33	21	var nCSS='';
34		-for(var css in foundResColor){
35		- var c=foundResColor[css].replace(/#/,"");
36		- nCSS+='#COLOR'+c+" a{border-color:"+foundResColor[css]+"}\n";
37		- nCSS+='#COLOR'+c+" a:hover{border-color:red}\n";
	22	+for(var css=0;css<foundColor.length;css++){
	23	+ nCSS+='#COLOR'+css+" a{border-color:"+foundColor[css]+"}";
	24	+ nCSS+='#COLOR'+css+" a:hover{border-color:red}";
38	25	}
39	26	document.write('<style type="text/css">'+nCSS+'</style>\n');
40		-//=========Ot@C¤pÌO[oÏ
	27	+//==========O[oÏ
41	28	var dts=document.getElementsByTagName('DT');
42	29	var dds=document.getElementsByTagName('DD');
43		-var idHash=new Array(); var refHash=new Array();
44		-var foundRes,highlight;
	30	+var fR;
45	31	//==========IDÆQÆðnbVÉi[
46		-// zñÌnbVæèy¢ÁÛ¢ÌÅAóæØèÌlÉæéPÈnbVÉµÄÝéeXgB
47		-// setEndIdx:{¶Ì¯Xðd¡µÈ¢æ¤ÉAHash»ÊuÆµÄÌdtsÌÅIindexðL¯
48		-// setEndNum:{¶ÈOXðd¡µÈ¢æ¤ÉAÅIXÔðL¯
49		-var setEndIdx=setEndNum=0;
	32	+var idHash=new Array(); var refHash=new Array(); var searchEnd=0;
50	33	function setHash(){
51		- //var t0=new Date();
52		- var l=Math.min(dts.length,dds.length);
53		- var lastNum=l ? parseInt(dts[l-1].firstChild.innerText) : 0;
54		- if(isNaN(lastNum)&&l>1){lastNum=parseInt(dts[l-2].firstChild.innerText)} //Footer èÈçêÂO
55		- if(l==0 \|\| lastNum<=setEndNum){return} // ÅãÜÅ²¸ÏÝÈçñð
56		- for(var i=setEndIdx;i<l;i++){
	34	+ var l=dts.length;
	35	+ if(dts[l-1].rel=="setEnd"){return} // ÅãÜÅ²¸ÏÝÈçñð
	36	+ for(var i=searchEnd;i<l;i++){
57	37	if(dds[i].parentElement.className=="refResult"){continue} // tQÆàÌDDÈçñð
58	38	var num=dts[i].firstChild.innerText; var span=dts[i].lastChild;
59	39	// ID
60		- var t=getID(span); if(t&&t.length>3){idHash[t] = idHash[t] ? idHash[t]+" "+num : num;} // ???âID:0,ID:#(@]k)ÍX[B
61		- // æÂ
62		- var imgURL=getIMG(span);
63		- if(imgURL){
64		- var dd=dts[i].nextSibling;
65		- if(tp && imgURL && !dd.getElementsByTagName("IMG").length){
66		- var aObj=(dd.innerText)?'<br><a href="'+imgURL+'">'+imgURL+'</a>':'<a href="'+imgURL+'">'+imgURL+'</a>';
67		- if(!beID && imgURL.match(/kako/)){/dd.insertAdjacentHTML("beforeEnd","<br>BeÉOCµÄÈ¢Ææ¾Å«Ü¹ñ");/}else{dd.insertAdjacentHTML("beforeEnd",aObj)}
68		- }
69		- }
70		- // ref,IMG
	40	+ var t=getID(span); idHash[t] = idHash[t] ? idHash[t]+" "+num : num;
	41	+ // ref
71	42	var ddAnc=dds[i].getElementsByTagName("A");
72		- for(var j=0;j<ddAnc.length;j++){
73		- if (checkAnchor(ddAnc[j].href)==0){
74		- continue;
75		- }else if(checkAnchor(ddAnc[j].href)==1){
76		- var anc=tohan(ddAnc[j].innerText.replace(/[>]/g,""));var start,end;
77		- if(anc.match(/(\d)\D+(\d)/)){
78		- start=parseInt(RegExp.$1); end=parseInt(RegExp.$2);
79		- if( (end-start>100) \|\| (num-end<4 && start==1) ){continue} // >>1-1000Æ©>>1-n(¼OX)Æ©ÍØíÉX[
80		- }else{
81		- start=end=parseInt(anc);
	43	+ for(var j=ddAnc.length;j--;){
	44	+ if(checkAnchor(ddAnc[j].href)!=1){continue}
	45	+ var anc=tohan(ddAnc[j].innerText.replace(/[>]/g,""));
	46	+ if(anc.match(/(\d)\D+(\d)/)){
	47	+ var start=parseInt(RegExp.$1); var end=parseInt(RegExp.$2);
	48	+ if(end-start>100){continue} // >>1-1000Æ©ÍØíÉX[
	49	+ else if(num-end<3 && start==1){continue} // >>1-n(¼OX)ÍË,Æ©àX[
	50	+ for(var k=start;k<=end;k++){
	51	+ if(refHash[k] && refHash[k].indexOf(num)!=-1){continue} // d¡ÍX[
	52	+ if(num>=k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // ¢ÖÌAJ[ÍX[
82	53	}
83		- var k=start-1;do{k++;
84		- if((!refHash[k] \|\| refHash[k].indexOf(num)==-1) && num>k){refHash[k]=refHash[k] ? refHash[k]+" "+num : num;} // d¡â¢ÖÌAJ[ÍX[
85		- }while(k<end);
86		- }else if(imageExt2(ddAnc[j].href) && onOpenLoad!=0){
87		- if(onOpenLoad==1){if(dds[i].previousSibling.className!="new"){continue}}
88		- insButton(ddAnc[j],ddAnc[j].href);
	54	+ }else{anc=parseInt(anc);
	55	+ if(refHash[anc] && refHash[anc].indexOf(num)!=-1){continue} // d¡ÍX[
	56	+ if(num>=anc){refHash[anc]=refHash[anc] ? refHash[anc]+" "+num : num;} // ¢ÖÌAJ[ÍX[
89	57	}
90	58	}
91	59	}
92		- setEndIdx=l;setEndNum=lastNum;
93		- //var t1=new Date(); var t=(t1-t0)/1000; if(t){alert(t+"b");}
94		-}
95		-// XbhEBhESÉOã5XðF
96		-var resUnit=new Array();
97		-function searchColoring(){
	60	+ dts[l-1].rel="setEnd"; searchEnd=l;
98	61	if(!coloring){return;} // FsvÈçI¹
99		- if(!scr){scr=lightmode ? document.body : document.getElementById("dl");}
100		- var nowScrollPos=scr.scrollTop+document.body.clientHeight/2;
101		- var l=Math.min(dts.length,dds.length);var st,ed;
102		- // dtÌoffsetTopði[i25XPÊj
103		- if(resUnit.length<=Math.floor(dts.length/25)){resUnit[0]=0;
104		- for(var i=25;i<l;i+=25){resUnit[i/25]=dts[i].offsetTop;}
105		- }
106		- // »ÝÇÌ ½èÜÅXN[µÄé©²¸
107		- var rul=resUnit.length-1;
108		- if (rul==0) {st=0;ed=l-1;} //25¢
109		- else if(resUnit[0]>nowScrollPos) {st=0;ed=24;} //0-24
110		- else if(resUnit[rul]<nowScrollPos){st=l-26;ed=l-1;} // ÅI25X
111		- else{
112		- for(var i=rul;i--;){
113		- if(resUnit[i+1]>nowScrollPos&&resUnit[i]<=nowScrollPos){st=i*25;ed=st+25;break}
	62	+ for(var i=l;i--;){
	63	+ if(!dts[i].innerText){continue}
	64	+ //if(dts[i].innerText.match(/id:/i)){ // IDªÈ¢ÂÅA¬»·é©àH
	65	+ var span=dts[i].lastChild; var t=getID(span); if(browser=="zbg]kQ"){span=span.lastChild}
	66	+ if(t && idHash[t] && span){
	67	+ var idResult=idHash[t].split(/\s/); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
	68	+ if (idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
	69	+ else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
	70	+ else if(idResult.length==1){span.title="¯êIDÍ\n èÜ¹ñ"}
	71	+ }
	72	+ //}
	73	+ var imgURL=getIMG(span);
	74	+ if(imgURL){dds[i].insertAdjacentHTML("afterBegin",'<img src="'+imgURL+'"><br>')}
	75	+ //
	76	+ var numA=dts[i].firstChild; var num=numA.innerText;
	77	+ if(refHash[num]){
	78	+ var refResult=refHash[num].split(/\s/);
	79	+ if (refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dts[i].title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
	80	+ else if(refResult.length>=threshold3[0]){numA.style.color=threshold3[1];dts[i].title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
	81	+ else{numA.title="±êÖÌXÍÈ¢Íl"}
114	82	}
115	83	}
116		- // »ÝÌÍÍà©çEBhEÌ^ñ ½èÉ\¦µÄéXðæ¾i±±ÅF·éÆA25XPÊÌØÖÉXªF³êÈ¢j
117		- var dtIdx=0; //if(cp){cp.childNodes[1].value=(st+1)+"-"+(ed+1);cp.style.visibility="visible";}
118		- for(var i=st;i<=ed;i++){if(!dts[i+1]){dtIdx=ed;break;}
119		- if(dts[i+1].offsetTop>nowScrollPos && dts[i].offsetTop<=nowScrollPos){dtIdx=i;break;}
120		- }
121		- // dtIdx©ç»ÌüÓðÁè
122		- var start=dtIdx-5;var end=dtIdx+5;//
123		- for(var i=start;i<=end;i++){
124		- if(dts[i]){setSearchColor(dts[i])}
125		- }
126	84	}
127		-// IDHashArefHashð³ÉF
128		-function setSearchColor(dt){
129		- if(!dt.innerText){return}
130		- // ID
131		- var span=dt.lastChild; var t=getID(span);//alert(t +"&&"+ idHash[t] +"&&"+ span);
132		- if (browser=="zbg]kQ"){span=span.lastChild}
133		- else if(browser=="A Bone") {span=span.childNodes[1]}
134		- if(t && idHash[t] && span){
135		- var idResult=idHash[t].split(" "); if(t.match(/\?\?\?/)){idResult="";idHash[t]="";}
136		- if (idResult.length>=threshold3[0]){span.style.color=threshold3[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
137		- else if(idResult.length>=threshold2[0]){span.style.color=threshold2[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
138		- else if(idResult.length>=threshold1[0]){span.style.color=threshold1[1];span.title="¯êID ("+idResult.length+"ñ)\n"+idHash[t]}
139		- else if(idResult.length==1){span.title="¯êIDÍ\n èÜ¹ñ"}
140		- }
141		- // ref
142		- var numA=dt.firstChild; var num=numA.innerText;
143		- if(refHash[num]){
144		- var refResult=refHash[num].split(" ");
145		- if (refResult.length>=threshold6[0]){numA.style.color=threshold6[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
146		- else if(refResult.length>=threshold5[0]){numA.style.color=threshold5[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
147		- else if(refResult.length>=threshold4[0]){numA.style.color=threshold4[1];dt.title="±êÖÌX ("+refResult.length+"Â)\n"+refHash[num];}
148		- else{numA.title="±êÖÌXÍÈ¢Íl"}
149		- }
	85	+var regIMG=new RegExp(".?\\s.?\\s.:.?\\sIMG:(.*?)(\\s\|$)"); // æàÂ\ÉµÄÝé
	86	+function getIMG(obj){
	87	+ if(regIMG.test(obj.innerText)){
	88	+ var filename=RegExp.$1;
	89	+ var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
	90	+ var fileurl="http://up01.2ch.io/_img/"+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
	91	+ return(fileurl)
	92	+ }else{return(false)}
150	93	}
151	94	//==========¼OEIDõ
152		-function searchPerson(obj){
153		- var by,thisDT,reg;
154		- if (obj.tagName=="DT") {by="ID"; thisDT=obj; reg=getID(obj)}
155		- else if(obj.tagName=="SPAN"){by="ID"; thisDT=obj.parentElement;reg=getID(obj)}
156		- else if(obj.tagName=="U") {by="NAME";thisDT=obj.parentElement; reg=obj.innerHTML.replace(/<B>(.?)<\/B>/ig,"");if(!reg){reg=RegExp.$1.replace(/<.?A.?>/ig,"")}/¼Oª*/}
157		- else if(obj.tagName=="B") {by="NAME";thisDT=obj.parentElement.parentElement;reg=obj.innerText}
158		- else{return}
159		- if(!thisDT.rel){
160		- var c=selectColor("res"); if(!c){return} var color=new Array(c); // J[Ið
161		- if(by=="ID"){
162		- if(!reg \|\| !idHash[reg]){return} // IDÈµAID:???A{¶Ì¼XÌRsyID
163		- // õnbVÉlðÝèµÄA»êÉîÃ«XF
164		- foundRes[c]=idHash[reg].split(" "); foundRes[c].word="ID:"+reg;
165		- for(i in foundRes[c]){var dt=getDTfromAnc(foundRes[c][i]);toggleResColor(dt,c);}
166		- }else{
167		- var us=document.getElementsByTagName("U"); var l=us.length;
168		- var regName=new RegExp();regName.compile(reg);
169		- // [vÉXFElÌÝèð¯Às
170		- for(var i=l;i--;){var dt=us[i].parentElement;
171		- if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
172		- if(regName.test(us[i].innerText)){toggleResColor(dt,c);foundRes[c].unshift(dt.firstChild.innerText);}
173		- }
174		- foundRes[c].word=reg;
175		- }
176		- returnFound("res",color);
	95	+// IDÌõEí
	96	+function searchID(obj){
	97	+ var singleColor=event.altKey;
	98	+ var decoy=obj.parentElement ? obj.parentElement : obj;
	99	+ var reg=getID(obj);
	100	+ if(!decoy.id.match(/^COLOR/)){
	101	+ if(!idHash[reg]){return}
	102	+ var target=new Array();target=idHash[reg].split(" ");
	103	+ // J[Ið
	104	+ var c = singleColor ? 0 : selectColor();
	105	+ if (c=="restart"){c=0;singleColor=true}
	106	+ else if(c=="exit"){return;}
	107	+ // õ
	108	+ for(i in target){var dt=getDTfromAnc(target[i]);activate(dt,c);}
	109	+ foundReturn(target);
177	110	}else{
178		- clearColor("res",thisDT.style.backgroundColor);
	111	+ clearResult(obj);return;
179	112	}
180	113	}
181		-// ID¶ñÌo
182		-var regID=new RegExp(); // HOSTàÂ\ÉµÄÝé
183		-regID.compile(".?\\s.?\\s.:(.?)(\\s\|$)"); // 1000resÅ0.02bÙÇ¬
184		-function getID(span){
185		- if(regID.test(span.innerText)){return(RegExp.$1)}else{return(false)}
186		-}
187		-//==========FÝèð
188		-// IuWFNgÌú»
189		-function createHash(name,key,arr,word){
190		- name[key]=arr?arr:new Array();
191		- name[key].word=word?word:"";
192		- name[key].justMovedRes=undefined;
193		-}
194		-// FIð(YXÔzñð½È¢L[ðÔ·)
195		-function selectColor(type){
196		- if(!foundRes) {foundRes =new Array();for(var i in foundResColor) {createHash(foundRes,foundResColor[i]);}} // Hash foundRes ={F:YXÔzñ}
197		- if(!highlight){highlight=new Array();for(var i in highlightColor){createHash(highlight,highlightColor[i]);}} // Hash hightLight={F:YXÔzñ}
198		- var cHash,cArray,cMess;
199		- if(type=="res"){cHash=foundRes; cArray=foundResColor; cMess="¡ÜÅÌXFððµÜ·©H";}
200		- else {cHash=highlight;cArray=highlightColor;cMess="¡ÜÅÌnCCgððµÜ·©H";}
201		- var i=0; while(cHash[cArray[i]].word){
202		- i++; if(i==cArray.length){if(confirm(cMess)){clearColor(type);i=0;break}else{i=null;break}}
203		- }
204		- return(cArray[i]);
	114	+// ID\|bvAbv
	115	+function searchPopup(obj){
	116	+ var objs=document.getElementsByTagName(obj.tagName);
	117	+ var reg=getID(obj);if(!reg){return}
	118	+ var target=idHash[reg].split(" ");
	119	+ if(target.length==1){return}
	120	+ if(!obj.rel){obj.rel=obj.href;} obj.href="decoy:";
	121	+ var targetString=""; for(i in target){targetString+=returnString(target[i])} //gÌØèoµ
	122	+ if(targetString){popup(targetString);}else{obj.href=obj.rel;} //ÎÛª¶Ýµ½çrelÉÞðµÄ\|bvAbv
205	123	}
206		-// FðinbVAÎÛAfoundPanelj
207		-function clearColor(type,color){
208		- var cHash=(type=="res")?foundRes:highlight;
209		- if(event && event.altKey){color=""}
210		- for(var i in cHash){
211		- if(type=="res"){
212		- if(color && i!=color){continue} // wèFÅÈ¯êÎX[
213		- for(var j in cHash[i]){
214		- if(event.srcElement.value=="DEL"){removeRes(getDTfromAnc(cHash[i][j]))}else{toggleResColor(getDTfromAnc(cHash[i][j]))}
215		- }
216		- cHash[i]=new Array();
217		- document.getElementById("c"+i).removeNode(true);
218		- }else{
219		- var strongs=document.getElementsByTagName("STRONG");
220		- var reg=new RegExp(i);
221		- if(!color.match(i)){continue} // wèFÅÈ¯êÎX[
222		- for(var j=0;j<strongs.length;j++){
223		- if(strongs[j].style.backgroundColor==i){
224		- if(event.srcElement.value=="DEL"){removeRes(strongs[j].parentElement.previousSibling);j--}else{strongs[j].removeNode(false);j--}
225		- }
226		- }
227		- cHash[i]=new Array();
228		- if(document.getElementById("c"+i)){document.getElementById("c"+i).removeNode(true);} // and,orõÅPFÚÌÝ
	124	+// ¼OÌõEí
	125	+function search(obj){
	126	+ var singleColor=event.altKey;
	127	+ var objs=document.getElementsByTagName(obj.tagName);
	128	+ var reg=obj.innerText; var target="objs[i].innerText"; //¼OEgbv
	129	+ var decoy=obj.parentElement ? obj.parentElement : obj;
	130	+ if(!decoy.id.match(/^COLOR/)){
	131	+ // J[Ið
	132	+ var c = singleColor ? 0 : selectColor();
	133	+ if (c=="restart"){c=0;singleColor=true}
	134	+ else if(c=="exit"){return;}
	135	+ // õ
	136	+ var found=new Array; var l=objs.length;
	137	+ for(var i=l;i--;){
	138	+ var dt=objs[i].parentElement; if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
	139	+ if(eval(target)==reg){activate(dt,c);found.unshift(dt.firstChild.innerText);}
	140	+ else if(singleColor) {deactivate(dt)}
229	141	}
230		- }
231		- if(!fp.hasChildNodes()){fp.style.visibility="hidden";searched=false;}
232		-}
233		-// XFgO
234		-function toggleResColor(dt,c){
235		- if(!dt){return} // for-inÅçêéÔÈOÌobjÈçI¹
236		- if(c){
237		- dt.rev=dt.style.backgroundColor;
238		- dt.rel="colored";
239		- dt.id ="COLOR"+c.replace(/#/,"");
240		- dt.style.backgroundColor=c;
	142	+ foundReturn(found);
241	143	}else{
242		- dt.style.backgroundColor=dt.rev;
243		- if(dt.id.match(/COLOR/)){dt.removeAttribute("id")}//else{alert("dtÉCOLOR***ÈOÌidi"+dt.id+"jªÝè³êÄ¢Ü·")}
244		- dt.removeAttribute("rev");
245		- dt.removeAttribute("rel");
	144	+ clearResult(obj);return;
246	145	}
247	146	}
248		-// õÊÉîÃ«Á
249		-function removeRes(dt){if(!dt){return} // cHash[i][j]=ID:xxxxxxxxÌÆ«
250		- if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;} // LiveÌÝ-§¾ Ú`ñ
251		- dt.nextSibling.removeNode(true);dt.removeNode(true);
	147	+
	148	+// ID¶ñÌo
	149	+//var regID=new RegExp("ID:(.*)$");
	150	+var regID=new RegExp(".?\\s.?\\s.:(.?)(\\s\|$)"); // HOSTâçµ½çÎàÂ\ÉµÄÝé
	151	+function getID(obj){
	152	+ if(regID.test(obj.innerText)){return(RegExp.$1)}else{return(false)}
	153	+}
	154	+// FÝè
	155	+function activate(obj,c){
	156	+ var color=foundColor[c];
	157	+ obj.rev=obj.style.backgroundColor;
	158	+ obj.style.backgroundColor=color;
	159	+ obj.id="COLOR"+c; // ¯êidª¡¶¶éªByNameÅÍdtÌname©çæ¾Å«È¢½ßâÞÈµ
252	160	}
253		-//==========Ê\¦
254		-// XÔXgi\|bvAbvAJ[ðÜÞj
255		-function returnFound(type,color){
256		- var cHash=(type=="res")?foundRes:highlight;
257		- var nDIV="";var numArray=cHash[color[0]]; var display=new Array(["none","POP"],["inline","LST"]);
258		- if(searchView=="resPopup" \|\| numArray.length>=listLimit){display=display.reverse();}
259		- // \|bvAbv
260		- var nTT="";for(var i=0;i<color.length;i++){nTT+='<tt style="background-color:'+color[i]+'"> '+cHash[color[i]].word+'</tt>';}
261		- nDIV+='<span rel="'+type+'" style="display:'+display[0][0]+'">'+nTT+'</span>';
262		- // Xg
263		- var nA="";for(var i=0;i<numArray.length;i++){nA+=addAnchor(numArray[i],numArray[i])+" "}
264		- nDIV+='<tt style="background-color:'+color[0]+'" style="display:'+display[1][0]+'"> '+nA+'</tt>';
265		- // Â
266		- nDIV+=' '+numArray.length+' ';
267		- var buttons='<input type="button" value="'+display[0][1]+'" onclick="changeSearchView();blur()"><input type="button" value="É" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ºÖõ"><input type="button" value="È" onclick="moveToSearchRes(\''+type+'\',\''+color+'\')" title="ãÖõ"><input type="button" value="CLR" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Altº\nFXSÄ"><input type="button" value="DEL" onclick="clearColor(\''+type+'\',\''+color+'\')" title="Altº\nFXSÄ">';
268		- fp.innerHTML+='<div id="c'+color[0]+'">'+nDIV+buttons+'</div>';
269		- fp.style.visibility="visible";searched=true;
	161	+// FA
	162	+function deactivate(obj){if(!obj){return}
	163	+ obj.style.backgroundColor=obj.rev;
	164	+ if(obj.id!="sizeinfo"){obj.removeAttribute("id");}
	165	+ obj.removeAttribute("rev");
	166	+ obj.removeAttribute("title");
270	167	}
271		-// ÎÛXÉWv
272		-var markedDT;
273		-function moveToSearchRes(type,color){
274		- if(color.match(/(.*?),/)){color=RegExp.$1}
275		- var scope = (event && event.srcElement.value=="È") ? false : true ;
276		- var numArray= (type=="res") ? foundRes[color] : highlight[color];
277		- if(isNaN(numArray.justMovedRes)){numArray.justMovedRes=0}
278		- else{
279		- markedDT.style.borderColor="#999";
280		- if(scope){numArray.justMovedRes++;if(numArray.justMovedRes>=numArray.length){numArray.justMovedRes--;alert("±êæèºÉÍ èÜ¹ñ")}}
281		- else {numArray.justMovedRes--;if(numArray.justMovedRes<0){numArray.justMovedRes++;alert("±êæèãÉÍ èÜ¹ñ")}}
	168	+// J[Ið
	169	+function selectColor(){
	170	+ var c=0;
	171	+ while(document.getElementById("COLOR"+c)){
	172	+ c++;
	173	+ if(!foundColor[c]){if(confirm("Fðú»µÜ·©H")){return("restart")}else{return("exit")}}
282	174	}
283		- markedDT=getDTfromAnc(numArray[numArray.justMovedRes]); markedDT.style.borderColor="red";
284		- markedDT.scrollIntoView(true);
285		- setTimeout('markedDT.style.borderColor="#999"',5000);
	175	+ return(c);
286	176	}
287		-// \|bvAbvÆXg\¦ØèÖ¦
288		-function changeSearchView(){
289		- var e=event.srcElement;
290		- if(e.value=="POP"){
291		- e.value="LST";
292		- e.parentElement.childNodes[0].style.display="inline";
293		- e.parentElement.childNodes[1].style.display="none";
	177	+// Ê\¦
	178	+function foundReturn(found){
	179	+ if(!fR){document.body.insertAdjacentHTML('afterBegin','<div id="foundResult"></div>');fR=document.getElementById("foundResult");}
	180	+ //dtÌtitleÉ
	181	+ for(var i=found.length;i--;){dt=getDTfromAnc(found[i]);dt.title=found.join(" ");}
	182	+ //foundResultÉ
	183	+ var buttons='<input type="button" value="CLR" onclick="clearResult(this)" title="Altº\nFXSÄ"><input type="button" value="DEL" onclick="clearResult(this)" title="Altº\nFXSÄ">';
	184	+ if(found.length>=20 && confirm("20Èã é¯Ç\¦·éH")==false){
	185	+ fR.innerHTML=buttons; fR.title=found.join(" ");
294	186	}else{
295		- e.value="POP";
296		- e.parentElement.childNodes[0].style.display="none";
297		- e.parentElement.childNodes[1].style.display="inline";
	187	+ for(var i=0;i<found.length;i++){found[i] = addAnchor(found[i],found[i])}
	188	+ fR.innerHTML=found.join(" ")+buttons;
298	189	}
	190	+ fR.style.visibility="visible";
299	191	}
300		-
301		-//==========Pêõ
302		-function findIt(arg){createSearchPanel(arg);}
303		-var searchWindow=null;
304		-// õEBhEÌ\¦
305		-function createSearchPanel(arg){ // êpuEUÅÌmodelessDialogÖÌOÇÝÝÅÍAdialogArgumentsªêÈ¢ÌÅ¼Ú«o·
306		- if(arg){word=arg}
307		- if(searchWindow && !searchWindow.closed){return}
308		- var skinPath=document.getElementsByName("SkinPath")[0].content;
309		- searchWindow=showModelessDialog("",window,'dialogWidth:500px;dialogHeight:200px;dialogTop:0px;dialogLeft:0px;help:no;resizable:yes;status:no;unadorned:yes;');
310		- var nWin='<html><head><title>PêÌõ<\/title>'
311		- +'<script type="text/javascript">function submitEvent(){var fo=document.forms[0]; dialogArguments.word=fo.word.value; var i=-1;do{i++;dialogArguments.expression =fo.expression[i].value;}while(!fo.expression[i].checked); var i=0; while(fo.searchTarget[i]){dialogArguments.searchTarget[fo.searchTarget[i].value]=fo.searchTarget[i].checked;i++;} var i=-1;do{i++;dialogArguments.searchView =fo.searchView[i].value;}while(!fo.searchView[i].checked); dialogArguments.searchWord();}</script>'
312		- +'<style type="text/css">body{background:ThreeDFace;padding:0.5em;overflow:auto} fieldset{padding:0.5em;margin-top:0.5em;} legend,label,input{font:message-box;}</style>'
313		- +'<\/head><body onunload="unloadEvent()"><form onsubmit="submitEvent();return false;"><table width="100%"><tr><td valign="top" colspan="3">'
314		- +'<label for="word">õ¶ñF</label><input type="text" name="word" id="word" size="50" value="'+word+'" tabindex="0"><br>'
315		- +'</td><td align="right" valign="top" rowspan="2">'
316		- +'<input type="submit" name="submit" value="@@õ@" tabindex="7"><br><br><input type="button" name="cancel" value="LZ" onclick="window.close()" tabindex="8">'
317		- +'</td></tr><tr valign="top">'
318		- +'<td><fieldset><legend>õû@</legend><input type="radio" name="expression" value="default" id="tDef" tabindex="1"> <label for="tDef">Êíõ</label><br><input type="radio" name="expression" value="regExp" id="tReg"> <label for="tReg">³K\»</label><br><input type="radio" name="expression" value="multiAND" id="tAND"> <label for="tAND">ANDõ</label><br><input type="radio" name="expression" value="multiOR" id="tOR"> <label for="tOR">ORõ</label></fieldset></td>'
319		- +'<td><fieldset><legend>õÎÛ</legend><input type="checkbox" name="searchTarget" value="name" id="tName" tabindex="2" checked> <label for="tName">¼O</label><br><input type="checkbox" name="searchTarget" value="mail" id="tMail" tabindex="3" checked> <label for="tMail">[</label><br><input type="checkbox" name="searchTarget" value="id" id="tID" tabindex="4" checked> <label for="tID">útÆID</label><br><input type="checkbox" name="searchTarget" value="mess" id="tMess" tabindex="5" checked> <label for="tMess">{¶</label></fieldset></td>'
320		- +'<td><fieldset><legend>Ê\¦</legend><input type="radio" name="searchView" value="resList" id="rList" tabindex="6"> <label for="rList">XÔð\¦</label><br><input type="radio" name="searchView" value="resPopup" id="rPop"> <label for="rPop">Xð\|bvAbv</label><br><input type="radio" name="searchView" value="resJump" id="rJump"> <label for="rJump">XÖWv</label></fieldset></td>'
321		- +'</tr></table></form><\/body><\/html>';
322		- searchWindow.document.write(nWin);
323		- sdf=searchWindow.document.forms[0]; sdf.elements[0].select();
324		- var ex=sdf.expression;for(var i=0;i<ex.length;i++){if(ex[i].value==expression){ex[i].checked=true}}
325		- var sv=sdf.searchView;for(var i=0;i<sv.length;i++){if(sv[i].value==searchView){sv[i].checked=true}}
326		- range=document.body.createTextRange();
327		-}
328		-// õC
329		-var word="";var range;var searchTarget={"word":true};
330		-function searchWord(){
331		- if(!word){return}
332		- var matchs=new Array(); var color=new Array();
333		- // õû@
334		- if(expression=="regExp" \|\| expression=="default" \|\| (expression.match(/multi/) && !word.match(/\s/))){ // AND/ORÅêPêÈçdefaultÅõ
335		- // õêwèid¡rÅ¬»Hj
336		- if(expression=="regExp"){
337		- var regWord=word.replace(/[\^\$]/g,"");
338		- var reg=new RegExp(regWord,"g"); var tmpArr=range.text.match(reg); var tmp;
339		- if(!tmpArr \|\| !tmpArr.length){tmpArr=new Array(tmpArr)} // õÊ0or1ÈçAzñì¬
340		- tmpArr.sort();for(var i=0;i<tmpArr.length;i++){if(tmp!=tmpArr[i]){matchs.push(tmpArr[i])}tmp=tmpArr[i]}
341		- if(!matchs \|\| !matchs.length){matchs[0]=word} // õÊ0or1ÈçAzñì¬
342		- }else{matchs[0]=word}
343		- // nCCg
344		- for(var i=0;i<matchs.length;i++){color.push(setHighlight(matchs[i]));}
345		- highlight[color[0]].word=word;
	192	+// ÊÁAÊí
	193	+function clearResult(obj){
	194	+ var fromObj=obj.parentElement;
	195	+ var singleColor=event.altKey;
	196	+ var result=new Array();var arrayElement; var numbers=fromObj.title ? fromObj.title : fromObj.innerText;
	197	+ if(singleColor){result=dts; arrayElement="result[i]";}
	198	+ else {result=numbers.split(" ");arrayElement="getDTfromAnc(result[i])";}
	199	+ var l=result.length;
	200	+ if(!result[0]){
	201	+ /* õÊ[ÅàresultªnullÉÈçÈ¢Îô */
	202	+ }else if(event.srcElement.value!="DEL"){
	203	+ for(var i=l;i--;){
	204	+ var dt=eval(arrayElement);
	205	+ deactivate(dt);
	206	+ }
346	207	}else{
347		- // õêwè
348		- var matchs=word.split(" "); var tmpArr=new Array(); var tmp;
349		- // nCCg¨d¡
350		- for(var i=0;i<matchs.length;i++){
351		- color.unshift(setHighlight(matchs[i]));
352		- highlight[color[0]].word=matchs[i];
353		- tmpArr=tmpArr.concat(highlight[color[0]])
	208	+ for(var i=l;i--;){
	209	+ var dt=eval(arrayElement); var dd=dt.nextSibling;
	210	+ //Live@\ÇÁ - §¾ Ú`ñ
	211	+ if(browser=="Live2ch"){location.href='func:ABONECLEAR?'+dt.firstChild.innerText;}
	212	+ dt.removeNode(true); dd.removeNode(true);
354	213	}
355		- color.reverse();tmpArr.sort();createHash(highlight,color[0],"",matchs[0]); // êUú»
356		- var judge = (expression=="multiAND") ? "tmp==tmpArr[i]" : "tmp!=tmpArr[i]";
357		- for(var i=0;i<tmpArr.length;i++){if(eval(judge)){highlight[color[0]].push(tmpArr[i])}tmp=tmpArr[i]} // õÊÍhighlight[color[0]]Éüêé
358	214	}
359		- // Ê\¦
360		- if (searchView=="resList") {returnFound("search",color);searchWindow.close();}
361		- else if(searchView=="resPopup"){returnFound("search",color);searchWindow.close();}
362		- else if(searchView=="resJump") {returnFound("search",color);searchWindow.close();if(highlight[color[0]].length){moveToSearchRes("search",color.join(","))}}
	215	+ if(fR){fR.innerText="";fR.style.visibility="hidden";}
363	216	}
364		-// nCCgõ
365		-function setHighlight(reg){
	217	+
	218	+//==========Pêõ
	219	+function findIt(word){
	220	+ if(!word){
	221	+ var word = prompt("õ·é¶ðüÍµÄ¾³¢B","");
	222	+ word = unescape(escape(word).split("%00")[0]); //IE5ÌoOÎô
	223	+ }
	224	+ if(!word \|\| word=="null"){return}
366	225	// J[Ið
367		- var c=selectColor("highlight"); if(!c){return}
	226	+ var singleColor=event.altKey;
	227	+ var c = singleColor ? 0 : selectColor();
	228	+ if (c=="restart"){c=0;singleColor=true}
	229	+ else if(c=="exit"){return;}
368	230	// õ
369		- while(range.findText(reg)){
370		- var dt=range.parentElement();var tag=dt.tagName; var thisRange;
371		- // õÎÛÅièÝ
372		- if(tag=="B"\|\|tag=="U"){thisRange="name"}
373		- else if(tag=="DT") {thisRange="mail"}
374		- else if(tag=="SPAN") {thisRange="id"}
375		- else if(tag=="DD" \|\| tag=="A" && dt.parentElement.tagName=="DD"){thisRange="mess"}
376		- else if(tag=="STRONG"){thisRange="word"}
377		- else{/alert("tagF"+tag+"\ndt:"+dt.outerHTML);/range.collapse(false);continue;} // XÔ(A)âõÊ©Ì(TT)
378		- if(!searchTarget[thisRange]){range.collapse(false);continue;}
379		- // ³K\»ÌÊuwèqª éêAïÜvfàÅÄõ
380		- if(expression=="regExp" && word.match(/[\^\|\$]/)){
381		- var thisReg=new RegExp(word); var targetText=(tag=="STRONG") ? dt.parentElement.innerText : dt.innerText;
382		- if(!targetText.match(thisReg)){range.collapse(false);continue}
383		- }
384		- // dtæ¾¨XÔæ¾¨nCCg
385		- if(dt.tagName!="DT"){
386		- while(dt.tagName!="DT" && dt.tagName!="DD"){dt=dt.parentElement}
387		- if(dt.tagName=="DD"){dt=dt.previousSibling}
388		- }
389		- var num=dt.firstChild.innerText;
390		- if(dt.parentElement.className!="refResult" && num!=highlight[c][highlight[c].length-1]){highlight[c].push(num)} // tQÆàÌDT,¯êÔÈçñð
391		- range.pasteHTML('<strong style="background-color:'+c+'">'+range.text+'</strong>');
392		- range.collapse(false);
	231	+ var found=new Array; var l=dds.length;
	232	+ var bodyText=document.body.createTextRange();
	233	+ for(var i=l;i--;){
	234	+ var dt=dts[i]; var dd=dds[i]; if(dt.parentElement.className=="refResult"){continue} // tQÆàÌDTÈçñð
	235	+ bodyText.moveToElementText(dt); var checkDT=bodyText.findText(word,0);
	236	+ bodyText.moveToElementText(dd); var checkDD=bodyText.findText(word,0);
	237	+ if(checkDT \|\| checkDD){activate(dt,c);found.unshift(dt.firstChild.innerText)}
	238	+ else if(singleColor) {deactivate(dt);}
393	239	}
394		- range=document.body.createTextRange(); // Wð³ÉßµÄ¨
395		- return(c);
	240	+ if(found){foundReturn(found)}
396	241	}
397	242	//==========tQÆ
398	243	function searchRef(obj){

		@@ -400,7 +245,16 @@ function searchRef(obj){
400	245	var num=obj.firstChild.innerText;
401	246	if(refHash[num]){
402	247	var refArr=refHash[num].split(/\s/); var refs="";
403		- for(var i=0;i<refArr.length;i++){refs+=returnString(refArr[i]);}
	248	+ for(var i=0;i<refArr.length;i++){
	249	+ var dtOrg=getDTfromAnc(refArr[i]); var dt=dtOrg.cloneNode(true); var dd=dtOrg.nextSibling.cloneNode(true);
	250	+ // {¶ÈOðí
	251	+ if(dd.lastChild){
	252	+ if(dd.lastChild.tagName=="DL"){dd.lastChild.removeNode(true);} //tQÆÌ
	253	+ if(dd.lastChild.name){dd.lastChild.removeNode(true);} // LABELNUMBERªÈ¢àÌÉWésvAJ[Ì
	254	+ }
	255	+ // {¶ði[
	256	+ refs+=dt.outerHTML.replace(/name=.?>/,">")+dd.outerHTML.replace(/<a name=.>/i,"");
	257	+ }
404	258	obj.nextSibling.insertAdjacentHTML("beforeEnd",'<dl class="refResult">'+refs+'</dl>')
405	259	obj.name="referred";
406	260	}

		@@ -428,26 +282,9 @@ function getDTfromAnc(num){
428	282	var anc=ancs(anchorHead+num);
429	283	if(!anc){return("")} //LABELNUMBERÎÌ Ú`ñáµÍ¢oÔÈçI¹
430	284	var obj=anc.parentElement; //LABELNUMBERÎÌàÌ
431		- if(!obj \|\| !obj.tagName){return false;}
432	285	if(obj.tagName!="DT"){ //LABELNUMBERñÎÌàÌ
433	286	if(num==1){if(anc){obj=anc.nextSibling} else{return("")}}
434	287	else {if(!anc.nextSibling){obj=anc.parentElement.nextSibling}else{return("")}}
435	288	}
436	289	return(obj);
437		-}
438		-
439		-// æÂÖA
440		-var regIMG=new RegExp(".?\\s.?\\s.:.?\\sIMG:(.*?)(\\s\|$)"); // æàÂ\ÉµÄÝé
441		-function getIMG(obj){
442		- if(regIMG.test(obj.innerText)){
443		- var filename=RegExp.$1;
444		- var tmp=filename.match(/(\d\d\d\d)(\d\d\d\d)(\d\d)/);
445		- var today=new Date();var last=new Date(today-72460601000);var date="";
446		- date+=last.getMonth()<9 ? "0"+(last.getMonth()+1) : last.getMonth()+1;
447		- date+=last.getDate()<10 ? "0"+last.getDate() : last.getDate();
448		- var log= (RegExp.$1+""+RegExp.$2 < last.getYear()+""+date) ? "_kako/" : "_img/";
449		- var fileurl="http://up01.2ch.io/"+log+RegExp.$1+"/"+RegExp.$1+RegExp.$2+"/"+RegExp.$3+"/"+filename;
450		- return(fileurl)
451		- }else{return(false)}
452		-}
453		-
	290	+}
		\ No newline at end of file

gikonavi Fork