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

update repo

Browse Source
This commit is contained in:
Alexander Popov 2022-12-22 23:46:07 +03:00
parent ff208644c2
commit 8adb7bd764
Signed by: iiiypuk
GPG Key ID: D8C9B59A9F04A70C
7 changed files with 32 additions and 6966 deletions
Show Stats Download Patch File Download Diff File 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).

8
index.html
View File

@ -15,10 +15,10 @@ This example demonstrates the minimum amount of code required to use Mergely.
<!-- Requires jQuery --> <!-- 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 --> <!-- 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" /> <link type="text/css" rel="stylesheet" href="./lib/codemirror.css" />
<!-- Requires Mergely --> <!-- 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" /> <link type="text/css" rel="stylesheet" href="./lib/mergely.css" />
</head> </head>
<body> <body>
@ -49,7 +49,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 +65,7 @@ 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> <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);
}); });
})(); })();