iiiypuk/diff-online
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: iiiypuk:ff208644c24588c21da7dcf2fc018a464917d08e
Branches Tags
iiiypuk:master
iiiypuk:0.1.1
iiiypuk:0.1.0
...
compare: iiiypuk:cd2017c621e27308888a4e3897950ecf99ec4893
Branches Tags
iiiypuk:master
iiiypuk:0.1.1
iiiypuk:0.1.0

2 Commits
ff208644c2 ... cd2017c621

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
7 changed files with 34 additions and 6976 deletions
Show Stats Expand all files Collapse all files

24
.editorconfig Normal file
View File

@ -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

1
CNAME
View File

@ -1 +0,0 @@
diff.hust.cc

3
README.md Normal file
View File

@ -0,0 +1,3 @@
## Text diff online tool
Originally project by [aTool-org](https://github.com/aTool-org/diff-online).

20
index.html
View File

@ -1,24 +1,18 @@
<!--
This example demonstrates the minimum amount of code required to use Mergely.
-->
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <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"> <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 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="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="keywords" content="diff,merge,compare,jsdiff,comparison,difference,file,text,unix,patch,algorithm,saas,longest common subsequence" />
<meta name="author" content="Jamie Peabody" /> <meta name="author" content="Alexander Popov" />
<!-- Requires jQuery -->
<script src="http://libs.baidu.com/jquery/1.9.0/jquery.min.js" type="text/javascript"></script> <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.min.js"></script>
<script type="text/javascript" src="./lib/codemirror.js"></script>
<link type="text/css" rel="stylesheet" href="./lib/codemirror.css" /> <link type="text/css" rel="stylesheet" href="./lib/codemirror.css" />
<!-- Requires Mergely --> <script type="text/javascript" src="./lib/mergely.min.js"></script>
<script type="text/javascript" src="./lib/mergely.js"></script>
<link type="text/css" rel="stylesheet" href="./lib/mergely.css" /> <link type="text/css" rel="stylesheet" href="./lib/mergely.css" />
</head> </head>
<body> <body>
@ -49,7 +43,7 @@ This example demonstrates the minimum amount of code required to use Mergely.
width: 'auto', width: 'auto',
height: '400', height: '400',
cmsettings: { cmsettings: {
readOnly: false, readOnly: false,
lineWrapping: true, lineWrapping: true,
}, },
lhs: function(setValue) { lhs: function(setValue) {
@ -65,7 +59,5 @@ This example demonstrates the minimum amount of code required to use Mergely.
}); });
$(window).resize(); $(window).resize();
}); });
</script> </script>
<span style="display:none;"><script src="http://s22.cnzz.com/stat.php?id=1253385992&web_id=1253385992" language="JavaScript"></script></span>
</html> </html>

5384
lib/codemirror.js
View File

File diff suppressed because it is too large Load Diff

1576
lib/mergely.js
View File

File diff suppressed because it is too large Load Diff

2
lib/searchcursor.js
View File

@ -128,4 +128,4 @@
CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) { CodeMirror.defineExtension("getSearchCursor", function(query, pos, caseFold) {
return new SearchCursor(this, query, pos, caseFold); return new SearchCursor(this, query, pos, caseFold);
}); });
})(); })();