テキスト比較

2 つのテキストファイルの違いを見つける

ライブエディター

空白の変更を非表示

未変更行を折りたたむ

折り返しなし

レイアウト

比較精度

テキストスタイル

シンタックスハイライト

Diffchecker Desktop Diffcheckerを実行する最も安全な方法。Diffchecker Desktopアプリを入手：あなたの差分はコンピューターから出ることはありません！Desktopを入手

Untitled diff

作成日 9 年前差分は期限切れになりません

95 削除

行
合計
削除

文字
合計
削除

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

162 行

67 追加

行
合計
追加

文字
合計
追加

この機能を引き続き使用するには、アップグレードしてください Diffchecker Pro 価格を見る

162 行

<!--

function Confirm_read_topics() {

return confirm("{L_CONFIRM_READ_TOPICS}");

}

//Rafraissiement des topics non lus.

function XMLHttpRequest_unread_topics(divID)

{

if (document.getElementById('refresh_unread' + divID))

document.getElementById('refresh_unread' + divID).className = 'fa fa-spinner fa-spin';

var xhr_object = xmlhttprequest_init('{PATH_TO_ROOT}/forum/xmlhttprequest.php?token={TOKEN}&refresh_unread=1');

xhr_object.onreadystatechange = function()

{

if( document.getElementById('refresh_unread' + divID) )

if (xhr_object.readyState == 4 && xhr_object.status == 200 && xhr_object.responseText != '')

document.getElementById('refresh_unread' + divID).className = 'fa fa-spinner fa-spin';

var xhr_object = xmlhttprequest_init('{PATH_TO_ROOT}/forum/xmlhttprequest.php?token={TOKEN}&refresh_unread=1');

xhr_object.onreadystatechange = function()

{

if( xhr_object.readyState == 4 && xhr_object.status == 200 && xhr_object.responseText != '' )

if (document.getElementById('refresh_unread' + divID))

{

document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';

if( document.getElementById('refresh_unread' + divID) )

document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';

var array_unread_topics = new Array('', '');

eval(xhr_object.responseText);

var array_unread_topics = new Array('', '');

eval(xhr_object.responseText);

if (array_unread_topics[0] > 0)

forum_display_block('forum_unread' + divID);

if( array_unread_topics[0] > 0 )

forum_display_block('forum_unread' + divID);

document.getElementById('nbr_unread_topics').innerHTML = array_unread_topics[1];

document.getElementById('nbr_unread_topics2').innerHTML = array_unread_topics[1];

document.getElementById('nbr_unread_topics').innerHTML = array_unread_topics[1];

document.getElementById('forum_blockforum_unread').innerHTML = array_unread_topics[2];

document.getElementById('nbr_unread_topics2').innerHTML = array_unread_topics[1];

document.getElementById('forum_blockforum_unread2').innerHTML = array_unread_topics[2];

document.getElementById('forum_blockforum_unread').innerHTML = array_unread_topics[2];

} else if (xhr_object.readyState == 4 && xhr_object.responseText == '')

document.getElementById('forum_blockforum_unread2').innerHTML = array_unread_topics[2];

{

}

alert("{L_AUTH_ERROR}");

else if( xhr_object.readyState == 4 && xhr_object.responseText == '' )

if (document.getElementById('refresh_unread' + divID))

{

document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';

alert("{L_AUTH_ERROR}");

if( document.getElementById('refresh_unread' + divID) )

document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';

}

xmlhttprequest_sender(xhr_object, null);

}

xmlhttprequest_sender(xhr_object, null);

var delay_forum = 1000;

}

var timeout_forum;

var displayed_forum = false;

var previous_forumblock;

//Affiche le bloc.

var delay_forum = 1000;

function forum_display_block(divID)

var timeout_forum;

var displayed_forum = false;

var previous_forumblock;

//Affiche le bloc.

function forum_display_block(divID)

{

if (timeout_forum)

clearTimeout(timeout_forum);

var block = document.getElementById('forum_block' + divID);

if (block.style.display == 'none')

{

if( timeout_forum )

if (document.getElementById(previous_forumblock))

clearTimeout(timeout_forum);

document.getElementById(previous_forumblock).style.display = 'none';

block.style.display = 'block';

var block = document.getElementById('forum_block' + divID);

displayed_forum = true;

if( block.style.display == 'none' )

previous_forumblock = 'forum_block' + divID;

{

} else

if( document.getElementById(previous_forumblock) )

{

document.getElementById(previous_forumblock).style.display = 'none';

block.style.display = 'none';

block.style.display = 'block';

displayed_forum = false;

displayed_forum = true;

previous_forumblock = 'forum_block' + divID;

}

else

{

block.style.display = 'none';

displayed_forum = false;

}

//Cache le bloc.

function forum_hide_block(forumid, stop)

{

if (stop && timeout_forum)

clearTimeout(timeout_forum);

else if (displayed_forum)

{

if( stop && timeout_forum )

clearTimeout(timeout_forum);

timeout_forum = setTimeout('forum_display_block(\'' + forumid + '\')', delay_forum);

else if( displayed_forum )

{

clearTimeout(timeout_forum);

timeout_forum = setTimeout('forum_display_block(\'' + forumid + '\')', delay_forum);

}

-->

}

</script>

--></script>

<h1>{FORUM_NAME}</h1>

<ul>

<li>

<i class="fa fa-globe"></i> <a class="small" href="index.php" title="{L_FORUM_INDEX}">{L_FORUM_INDEX}</a>

</span>

</li>

</ul>

</nav>

# IF C_USER_CONNECTED #

<ul>

<li>

<i class="fa fa-msg-track"></i> {U_TOPIC_TRACK}

</span>

</li>

<li>

<i class="fa fa-lastview"></i> {U_LAST_MSG_READ}

<i class="fa fa-msg-track"></i> <a class="small" href="{U_TOPIC_TRACK}" title="{L_SHOW_TOPIC_TRACK}">{L_SHOW_TOPIC_TRACK}</a>

</span>

</li>

</span>

</li>

<li>

<i class="fa fa-notread"></i> <a class="small" href="{U_MSG_NOT_READ}" title="{L_SHOW_NOT_READS}">{L_SHOW_NOT_READS} # IF C_IS_GUEST # ({NBR_MSG_NOT_READ})# ENDIF #</a>

</div>

</span>

</li>

<li>

<i class="fa fa-eraser"></i> {U_MSG_SET_VIEW}

</span>

</li>

# IF C_FORUM_CONNEXION #

<li>

<i class="fa fa-sign-out"></i> <a title="{L_DISCONNECT}" class="small" href="${relative_url(UserUrlBuilder::disconnect())}">{L_DISCONNECT}</a>

</span>

</li>

# ENDIF #

</ul>

</nav>

# ELSE #

# IF C_FORUM_CONNEXION #

<ul>

<li>

<i class="fa fa-sign-in"></i> <a title="{L_CONNECT}" class="small" href="${relative_url(UserUrlBuilder::connect())}">{L_CONNECT}</a>

</span>

</li>

<li>

<i class="fa fa-ticket"></i> <a title="{L_REGISTER}" class="small" href="${relative_url(UserUrlBuilder::registration())}">{L_REGISTER}</a>

</span>

</li>

</ul>

</nav>

# ENDIF #

</div>

<!--

jQuery("#cssmenu-forum-top-link").menumaker({ title: " ${LangLoader::get_message('forum.links', 'common', 'forum')} ", format: "multitoggle", breakpoint: 768, menu_static: false });

jQuery("#cssmenu-forum-top-link").menumaker({title: " ${LangLoader::get_message('forum.links', 'common', 'forum')} ", format: "multitoggle", breakpoint: 768, menu_static: false});

-->

</script>

</header>

保存された差分

原文

ファイルを開く

//Affiche le bloc.
		function forum_display_block(divID)
		{
			if( timeout_forum )
				clearTimeout(timeout_forum);
			
			var block = document.getElementById('forum_block' + divID);
			if( block.style.display == 'none' )
			{
				if( document.getElementById(previous_forumblock) )
					document.getElementById(previous_forumblock).style.display = 'none';
				block.style.display = 'block';
				displayed_forum = true;
				previous_forumblock = 'forum_block' + divID;
			}
			else
			{
				block.style.display = 'none';
				displayed_forum = false;
			}
		}

//Cache le bloc.
		function forum_hide_block(forumid, stop)
		{
			if( stop && timeout_forum )
				clearTimeout(timeout_forum);
			else if( displayed_forum )
			{
				clearTimeout(timeout_forum);
				timeout_forum = setTimeout('forum_display_block(\'' + forumid + '\')', delay_forum);
			}
		}
		-->
		</script>
<section id="module-forum">
	<header id="forum-top">
		
		<h1>{FORUM_NAME}</h1>
		
		<div class="forum-links">
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-left forum-index">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-globe"></i> <a class="small" href="index.php" title="{L_FORUM_INDEX}">{L_FORUM_INDEX}</a>
						</span>
					</li>
				</ul>
			</nav>
		# IF C_USER_CONNECTED #
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-right" id="cssmenu-forum-top-link">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-msg-track"></i> {U_TOPIC_TRACK}
						</span>
						
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-lastview"></i> {U_LAST_MSG_READ}
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-notread"></i> <span id="nbr_unread_topics">{U_MSG_NOT_READ}</span>
							<div class="forum-refresh">
								<div id="forum_blockforum_unread" style="display:none;"></div>
							</div>
							<a href="" onclick="XMLHttpRequest_unread_topics('');return false;" onmouseover="forum_hide_block('forum_unread', 1);" onmouseout="forum_hide_block('forum_unread', 0);"><i class="fa fa-refresh" id="refresh_unread"></i></a>
						</span>
						
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-eraser"></i> {U_MSG_SET_VIEW}
						</span>
					</li>
			# IF C_FORUM_CONNEXION #
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-sign-out"></i> <a title="{L_DISCONNECT}" class="small" href="${relative_url(UserUrlBuilder::disconnect())}">{L_DISCONNECT}</a>
						</span>
					</li>
			# ENDIF #
				</ul>
			</nav>
		# ELSE #
			# IF C_FORUM_CONNEXION #
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-right" id="cssmenu-forum-top-link">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-sign-in"></i> <a title="{L_CONNECT}" class="small" href="${relative_url(UserUrlBuilder::connect())}">{L_CONNECT}</a>
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-ticket"></i> <a title="{L_REGISTER}" class="small" href="${relative_url(UserUrlBuilder::registration())}">{L_REGISTER}</a>
						</span>
					</li>
				</ul>
			</nav>
			# ENDIF #
		# ENDIF #
			
			<div class="spacer"></div>
		</div>
		<script>
			
		</script>
	</header>

変更されたテキスト

ファイルを開く

//Rafraissiement des topics non lus.
	function XMLHttpRequest_unread_topics(divID)
	{
		if (document.getElementById('refresh_unread' + divID))
			document.getElementById('refresh_unread' + divID).className = 'fa fa-spinner fa-spin';

var xhr_object = xmlhttprequest_init('{PATH_TO_ROOT}/forum/xmlhttprequest.php?token={TOKEN}&refresh_unread=1');
		xhr_object.onreadystatechange = function()
		{
			if (xhr_object.readyState == 4 && xhr_object.status == 200 && xhr_object.responseText != '')
			{
				if (document.getElementById('refresh_unread' + divID))
					document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';

var array_unread_topics = new Array('', '');
				eval(xhr_object.responseText);

if (array_unread_topics[0] > 0)
					forum_display_block('forum_unread' + divID);

document.getElementById('nbr_unread_topics').innerHTML = array_unread_topics[1];
				document.getElementById('nbr_unread_topics2').innerHTML = array_unread_topics[1];
				document.getElementById('forum_blockforum_unread').innerHTML = array_unread_topics[2];
				document.getElementById('forum_blockforum_unread2').innerHTML = array_unread_topics[2];
			} else if (xhr_object.readyState == 4 && xhr_object.responseText == '')
			{
				alert("{L_AUTH_ERROR}");
				if (document.getElementById('refresh_unread' + divID))
					document.getElementById('refresh_unread' + divID).className = 'fa fa-refresh';
			}
		}
		xmlhttprequest_sender(xhr_object, null);
	}

var delay_forum = 1000;
	var timeout_forum;
	var displayed_forum = false;
	var previous_forumblock;

//Affiche le bloc.
	function forum_display_block(divID)
	{
		if (timeout_forum)
			clearTimeout(timeout_forum);

var block = document.getElementById('forum_block' + divID);
		if (block.style.display == 'none')
		{
			if (document.getElementById(previous_forumblock))
				document.getElementById(previous_forumblock).style.display = 'none';
			block.style.display = 'block';
			displayed_forum = true;
			previous_forumblock = 'forum_block' + divID;
		} else
		{
			block.style.display = 'none';
			displayed_forum = false;
		}
	}

<h1>{FORUM_NAME}</h1>

<div class="forum-links">
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-left forum-index">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-globe"></i> <a class="small" href="index.php" title="{L_FORUM_INDEX}">{L_FORUM_INDEX}</a>
						</span>
					</li>
				</ul>
			</nav>
			# IF C_USER_CONNECTED #
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-right" id="cssmenu-forum-top-link">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-showmymsg"></i> <a class="small" title="{L_SHOW_MY_MSG}" href="{U_SHOW_MY_MSG}">{L_SHOW_MY_MSG}</a>
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
						<i class="fa fa-msg-track"></i> <a class="small" href="{U_TOPIC_TRACK}" title="{L_SHOW_TOPIC_TRACK}">{L_SHOW_TOPIC_TRACK}</a>
						</span>
					</li>
					<li class="forum-index">
						<span class="cssmenu-title">
							<i class="fa fa-lastview"></i> <a class="small" href="{U_LAST_MSG_READ}" title="{L_SHOW_LAST_READ}">{L_SHOW_LAST_READ}</a>
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-notread"></i> <a class="small" href="{U_MSG_NOT_READ}" title="{L_SHOW_NOT_READS}">{L_SHOW_NOT_READS} # IF C_IS_GUEST # ({NBR_MSG_NOT_READ})# ENDIF #</a>
							<div class="forum-refresh">
								<div id="forum_blockforum_unread" style="display: none;"></div>
							</div>
							<a href="" onclick="XMLHttpRequest_unread_topics('');return false;" onmouseover="forum_hide_block('forum_unread', 1);" onmouseout="forum_hide_block('forum_unread', 0);"><i class="fa fa-refresh" id="refresh_unread"></i></a>
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-eraser"></i> <a class="small" href="{U_MSG_SET_VIEW}" title="{L_MARK_AS_READ}" onclick="javascript:return Confirm_read_topics();">{L_MARK_AS_READ}</a>
						</span>
					</li>
					# IF C_FORUM_CONNEXION #
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-sign-out"></i> <a title="{L_DISCONNECT}" class="small" href="${relative_url(UserUrlBuilder::disconnect())}">{L_DISCONNECT}</a>
						</span>
					</li>
					# ENDIF #
				</ul>
			</nav>
			# ELSE #
			# IF C_FORUM_CONNEXION #
			<nav itemscope itemtype="http://schema.org/SiteNavigationElement" class="cssmenu cssmenu-group float-right" id="cssmenu-forum-top-link">
				<ul>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-sign-in"></i> <a title="{L_CONNECT}" class="small" href="${relative_url(UserUrlBuilder::connect())}">{L_CONNECT}</a>
						</span>
					</li>
					<li>
						<span class="cssmenu-title">
							<i class="fa fa-ticket"></i> <a title="{L_REGISTER}" class="small" href="${relative_url(UserUrlBuilder::registration())}">{L_REGISTER}</a>
						</span>
					</li>
				</ul>
			</nav>
			# ENDIF #
			# ENDIF #