remove ads

update repo
2022-12-22 23:48:02 +03:00 · 2022-12-22 23:46:07 +03:00
7 changed files with 34 additions and 6976 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -0,0 +1,24 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[{*.html,*.css,*.json}]
+indent_style = tab
+indent_size = 4
+
+[lib/codemirror.css]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
--- a/1
+++ b/1
@ -1 +0,0 @@
-diff.hust.cc
--- a/README.md
+++ b/README.md
@ -0,0 +1,3 @@
+## Text diff online tool
+
+Originally project by [aTool-org](https://github.com/aTool-org/diff-online).
--- a/index.html
+++ b/index.html
@ -1,24 +1,18 @@
-<!--
-This example demonstrates the minimum amount of code required to use Mergely.
-->
 <!DOCTYPE html>
 <html lang="en">
 <head>
 	<meta charset="utf-8" />
-	<title>Online File Diff and Mergely, Powered By aTool. </title>
+	<title>Online File Diff and Mergely</title>
 	<meta http-equiv="X-UA-Compatible" content="chrome=1, IE=edge">
-	<link rel="shortcut icon" href="http://www.mergely.com/favicon.ico">
+	<link rel="shortcut icon" href="favicon.ico">
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
 	<meta name="description" content="Merge and Diff your documents with diff online and share" />
 	<meta name="keywords" content="diff,merge,compare,jsdiff,comparison,difference,file,text,unix,patch,algorithm,saas,longest common subsequence" />
-	<meta name="author" content="Jamie Peabody" />
-	<!-- Requires jQuery -->
+	<meta name="author" content="Alexander Popov" />
 	<script src="http://libs.baidu.com/jquery/1.9.0/jquery.min.js" type="text/javascript"></script>
-	<!-- Requires CodeMirror -->
-	<script type="text/javascript" src="./lib/codemirror.js"></script>
+	<script type="text/javascript" src="./lib/codemirror.min.js"></script>
 	<link type="text/css" rel="stylesheet" href="./lib/codemirror.css" />
-	<!-- Requires Mergely -->
-	<script type="text/javascript" src="./lib/mergely.js"></script>
+	<script type="text/javascript" src="./lib/mergely.min.js"></script>
 	<link type="text/css" rel="stylesheet" href="./lib/mergely.css" />
 </head>
 <body>
@ -65,7 +59,5 @@ This example demonstrates the minimum amount of code required to use Mergely.
 		});
 		$(window).resize();
 	});
-	
 </script>
-<span style="display:none;"><script src="http://s22.cnzz.com/stat.php?id=1253385992&web_id=1253385992" language="JavaScript"></script></span>
 </html>
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
--- a/lib/mergely.js
+++ b/lib/mergely.js
Author	SHA1	Message	Date
Alexander Popov	cd2017c621	remove ads	2022-12-22 23:48:02 +03:00
Alexander Popov	8adb7bd764	update repo	2022-12-22 23:46:07 +03:00