比较文本

查找两个文本文件之间的差异

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 9年前差异永不过期

3 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

141 行

2 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

138 行

<!--

var displayed = new Array();

displayed[${escapejs(FIELD)}] = false;

function XMLHttpRequest_preview(field)

{

if( XMLHttpRequest_preview.arguments.length == 0 )

field = ${escapejs(FIELD)};

var contents = tinymce.activeEditor.getContent();

var preview_field = 'xmlhttprequest-preview' + field;

if( contents == "" )

contents = jQuery('#' + field).val();

if( contents != "" )

{

if(!displayed[field])

jQuery("#" + preview_field).slideDown(500);

jQuery('#loading-preview-' + field).show();

displayed[field] = true;

jQuery.ajax({

url: PATH_TO_ROOT + "/kernel/framework/ajax/content_xmlhttprequest.php",

type: "post",

data: {

token: '{TOKEN}',

path_to_root: '{PHP_PATH_TO_ROOT}',

editor: 'TinyMCE',

page_path: '{PAGE_PATH}',

contents: contents,

ftags: '{FORBIDDEN_TAGS}'

success: function(returnData){

jQuery('#' + preview_field).html(returnData);

jQuery('#loading-preview-' + field).hide();

}

});

}

else

alert("{L_REQUIRE_TEXT}");

}

function insertTinyMceContent(content)

{

var ed = tinymce.activeEditor;

ed.insertContent(content);

ed.windowManager.close();

}

function setTinyMceContent(content)

{

tinymce.activeEditor.setContent(content);

}

-->

</script>

</div>

# IF NOT C_NOT_JS_INCLUDED #

# ENDIF #

<!--

tinymce.init({

selector : "textarea\#{FIELD}",

language : "{LANGUAGE}",

plugins: [

"advlist autolink autoresize autosave link image lists charmap hr anchor",

"searchreplace wordcount visualblocks visualchars fullscreen insertdatetime media",

"table contextmenu directionality smileys paste textcolor colorpicker textpattern imagetools"

external_plugins: {"nanospell": '{PATH_TO_ROOT}/TinyMCE/templates/js/tinymce/plugins/nanospell/plugin.js'},

nanospell_server: "php",

nanospell_dictionary: "fr, en",

# IF C_TOOLBAR #toolbar1: "{TOOLBAR}",# ENDIF #

menubar: false,

imagetools_proxy: '{PATH_TO_ROOT}/TinyMCE/lib/TinyMCEPicturesProxy.php',

autoresize_max_height: '500px',

advlist_number_styles: 'default',

advlist_bullet_styles: 'default',

block_formats: 'Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Preformatted=pre',

fontsize_formats: '5pt 10pt 15pt 20pt 25pt 30pt 35pt 40pt 45pt',

convert_urls: false,

media_alt_source: false,

media_poster: false,

content_css: [

"{PATH_TO_ROOT}/kernel/lib/css/font-awesome/css/font-awesome.css",

"{PATH_TO_ROOT}/templates/{THEME}/theme/global.css"

style_formats: [

{title: ${escapejs(LangLoader::get_message('success', 'status-messages-common'))}, inline: 'span', classes: 'success'},

{title: ${escapejs(LangLoader::get_message('error.question', 'status-messages-common'))}, inline: 'span', classes: 'question'},

{title: ${escapejs(LangLoader::get_message('error.notice', 'status-messages-common'))}, inline: 'span', classes: 'notice'},

{title: ${escapejs(LangLoader::get_message('error.warning', 'status-messages-common'))}, inline: 'span', classes: 'warning'},

{title: ${escapejs(LangLoader::get_message('error', 'status-messages-common'))}, inline: 'span', classes: 'error'}

setup : function(ed) {

ed.addButton('insertfile', {

icon: 'browse',

onclick: function (field_name) {

ed.windowManager.open({

title: '',

url: '{PATH_TO_ROOT}/user/upload.php?popup=1&close_button=0&fd=# IF C_HTMLFORM #' + HTMLForms.get("{FORM_NAME}").getId() + '_{FIELD_NAME}# ELSE #{FIELD}# ENDIF #&edt=TinyMCE',

width: 720,

height: 500,

});

tooltip: 'Insert file'

});

ed.on('blur', function(){

jQuery("\#{FIELD}").val(ed.getContent());

# IF C_HTMLFORM #

HTMLForms.get("{FORM_NAME}").getField("{FIELD_NAME}").enableValidationMessage();

HTMLForms.get("{FORM_NAME}").getField("{FIELD_NAME}").liveValidate();

# ENDIF #

})

smileys: [

# START smiley #

# IF smiley.C_NEW_ROW #[# ENDIF #

{ shortcut: '{smiley.CODE}', url: '{smiley.URL}', title: '{smiley.CODE}' }# IF NOT smiley.C_LAST_OF_THE_ROW #,# ENDIF #

# IF smiley.C_END_ROW #]# IF NOT smiley.C_LAST_ROW #,# ENDIF ## ENDIF #

# END smiley #

]

});

-->

</script>

已保存差异

原始文本

打开文件

var contents = tinymce.activeEditor.getContent();
	var preview_field = 'xmlhttprequest-preview' + field;
	
	if( contents == "" )
		contents = jQuery('#' + field).val();
	
	if( contents != "" )
	{
		if(!displayed[field])
			jQuery("#" + preview_field).slideDown(500);

jQuery('#loading-preview-' + field).show();

displayed[field] = true;

jQuery.ajax({
			url: PATH_TO_ROOT + "/kernel/framework/ajax/content_xmlhttprequest.php",
			type: "post",
			data: {
				token: '{TOKEN}',
				path_to_root: '{PHP_PATH_TO_ROOT}',
				editor: 'TinyMCE',
				page_path: '{PAGE_PATH}',
				contents: contents,
				ftags: '{FORBIDDEN_TAGS}'
			},
			success: function(returnData){
				jQuery('#' + preview_field).html(returnData);

jQuery('#loading-preview-' + field).hide();
			}
		});
	}
	else
		alert("{L_REQUIRE_TEXT}");
}

function insertTinyMceContent(content)
{
	var ed = tinymce.activeEditor;
	ed.insertContent(content);
	ed.windowManager.close();
}

function setTinyMceContent(content)
{
	tinymce.activeEditor.setContent(content);
}

-->
</script>
<div id="loading-preview-{FIELD}" class="loading-preview-container" style="display:none;">
	<div class="loading-preview">
		<i class="fa fa-spinner fa-2x fa-spin"></i>
	</div>
</div>
<div id="xmlhttprequest-preview{FIELD}" class="xmlhttprequest-preview" style="display:none;"></div>

# IF NOT C_NOT_JS_INCLUDED #
	<script src="{PATH_TO_ROOT}/TinyMCE/templates/js/tinymce/tinymce.min.js"></script>
# ENDIF #

menubar: false,
	imagetools_proxy: '{PATH_TO_ROOT}/TinyMCE/lib/TinyMCEPicturesProxy.php',
	autoresize_max_height: '500px',
	advlist_number_styles: 'default',
	advlist_bullet_styles: 'default',
	block_formats: 'Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Preformatted=pre',
	fontsize_formats: '5pt 10pt 15pt 20pt 25pt 30pt 35pt 40pt 45pt',
	convert_urls: false,
	media_alt_source: false,
	media_poster: false,
	content_css: [
		"{PATH_TO_ROOT}/kernel/lib/css/font-awesome/css/font-awesome.css",
		"{PATH_TO_ROOT}/templates/{THEME}/theme/global.css"
	],
	style_formats: [
		{title: ${escapejs(LangLoader::get_message('success', 'status-messages-common'))}, inline: 'span', classes: 'success'},
		{title: ${escapejs(LangLoader::get_message('error.question', 'status-messages-common'))}, inline: 'span', classes: 'question'},
		{title: ${escapejs(LangLoader::get_message('error.notice', 'status-messages-common'))}, inline: 'span', classes: 'notice'},
		{title: ${escapejs(LangLoader::get_message('error.warning', 'status-messages-common'))}, inline: 'span', classes: 'warning'},
		{title: ${escapejs(LangLoader::get_message('error', 'status-messages-common'))}, inline: 'span', classes: 'error'}
	],
	setup : function(ed) {
		ed.addButton('insertfile', {
			icon: 'browse',
			onclick: function (field_name) {
				ed.windowManager.open({ 
					title: '',
					url: '{PATH_TO_ROOT}/user/upload.php?popup=1&amp;close_button=0&amp;fd=# IF C_HTMLFORM #' + HTMLForms.get("{FORM_NAME}").getId() + '_{FIELD_NAME}# ELSE #{FIELD}# ENDIF #&amp;edt=TinyMCE',
					width: 720,
					height: 500,
				}); 
			},
			tooltip: 'Insert file'
		});
		ed.on('blur', function(){
			jQuery("\#{FIELD}").val(ed.getContent());
			# IF C_HTMLFORM #
			HTMLForms.get("{FORM_NAME}").getField("{FIELD_NAME}").enableValidationMessage();
			HTMLForms.get("{FORM_NAME}").getField("{FIELD_NAME}").liveValidate();
			# ENDIF #
		})
	},

smileys: [
		# START smiley #
			# IF smiley.C_NEW_ROW #[# ENDIF #
				{ shortcut: '{smiley.CODE}', url: '{smiley.URL}', title: '{smiley.CODE}' }# IF NOT smiley.C_LAST_OF_THE_ROW #,# ENDIF #
			# IF smiley.C_END_ROW #]# IF NOT smiley.C_LAST_ROW #,# ENDIF ## ENDIF #
		# END smiley #
	]
});
-->
</script>

更改后文本

打开文件

jQuery('#loading-preview-' + field).show();

displayed[field] = true;

jQuery('#loading-preview-' + field).hide();
			}
		});
	}
	else
		alert("{L_REQUIRE_TEXT}");
}

function insertTinyMceContent(content)
{
	var ed = tinymce.activeEditor;
	ed.insertContent(content);
	ed.windowManager.close();
}

function setTinyMceContent(content)
{
	tinymce.activeEditor.setContent(content);
}

-->
</script>
<div id="loading-preview-{FIELD}" class="loading-preview-container" style="display: none;">
	<div class="loading-preview">
		<i class="fa fa-spinner fa-2x fa-spin"></i>
	</div>
</div>
<div id="xmlhttprequest-preview{FIELD}" class="xmlhttprequest-preview" style="display: none;"></div>

# IF NOT C_NOT_JS_INCLUDED #
	<script src="{PATH_TO_ROOT}/TinyMCE/templates/js/tinymce/tinymce.min.js"></script>
# ENDIF #