Skip to content

Commit 22f2cb5

Browse files
rtfpessoartfpessoa
committed
Update diff2html and add style configurations
1 parent 85f833d commit 22f2cb5

File tree

7 files changed

+52
-35
lines changed

7 files changed

+52
-35
lines changed

‎.editorconfig

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This file is for unifying the coding style for different editors and IDEs
2+
# editorconfig.org
3+
4+
root = true
5+
6+
[*]
7+
end_of_line = lf
8+
charset = utf-8
9+
insert_final_newline = true
10+
trim_trailing_whitespace = true
11+
indent_style = space
12+
indent_size = 2
13+
max_line_length = 120
14+
15+
[Makefile]
16+
indent_style = tab

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@ target/
1818
# Node
1919
node_modules/
2020
npm-debug.log
21+
22+
# Istanbul
23+
coverage/

‎.jscsrc

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"disallowTrailingWhitespace": true,
2222
"maximumLineLength": 130,
2323
"requireCamelCaseOrUpperCaseIdentifiers": true,
24-
"requireCapitalizedComments": true,
2524
"requireCapitalizedConstructors": true,
2625
"requireSpaceAfterKeywords": [
2726
"if",

‎circle.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ test:
55
- nvm install 5 && npm test
66
post:
77
- npm install
8-
- istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec
8+
- npm test
99
- cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage
10-
- rm -rf ./coverage

‎dist/template.html

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
<!doctype html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8">
5-
<title>Diff to HTML by rtfpessoa</title>
4+
<meta charset="utf-8">
5+
<title>Diff to HTML by rtfpessoa</title>
66

7-
<!--
8-
Diff to HTML (template.html)
9-
Author: rtfpessoa
10-
-->
7+
<!--
8+
Diff to HTML (template.html)
9+
Author: rtfpessoa
10+
-->
1111

12-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/styles/github.min.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.3.0/styles/github.min.css">
1313

14-
<!--diff2html-css-->
14+
<!--diff2html-css-->
1515

16-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
1717

18-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/highlight.min.js"></script>
19-
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.1.0/languages/scala.min.js"></script>
18+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.3.0/highlight.min.js"></script>
19+
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.3.0/languages/scala.min.js"></script>
2020

21-
<!--diff2html-js-ui-->
21+
<!--diff2html-js-ui-->
2222

23-
<script>
24-
$(document).ready(function() {
25-
var diff2htmlUi = new Diff2HtmlUI();
26-
//diff2html-fileListCloseable
27-
diff2htmlUi.highlightCode('#diff');
28-
});
29-
</script>
23+
<script>
24+
$(document).ready(function() {
25+
var diff2htmlUi = new Diff2HtmlUI();
26+
//diff2html-fileListCloseable
27+
diff2htmlUi.highlightCode('#diff');
28+
});
29+
</script>
3030
</head>
3131
<body style="text-align: center; font-family: 'Source Sans Pro',sans-serif;">
3232
<h1>Diff to HTML by <a href="https://github.com/rtfpessoa">rtfpessoa</a></h1>
3333

3434
<div id="diff">
35-
<!--diff2html-diff-->
35+
<!--diff2html-diff-->
3636
</div>
3737
</body>
3838
</html>

‎package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "diff2html-cli",
3-
"version": "1.4.6-beta4",
3+
"version": "1.4.6-beta6",
44
"homepage": "https://www.github.com/rtfpessoa/diff2html-cli",
55
"description": "Fast Diff to colorized HTML",
66
"keywords": [
@@ -34,28 +34,28 @@
3434
"engines": {
3535
"node": ">=0.12.0"
3636
},
37-
"preferGlobal": "true",
37+
"preferGlobal": true,
3838
"scripts": {
39-
"test": "mocha",
40-
"style": "jscs src test",
41-
"codacy": "istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/.bin/codacy-coverage && rm -rf ./coverage"
39+
"test": "jscs src/*.js && istanbul cover _mocha -- -u exports -R spec ./test/**/*",
40+
"style": "jscs src/*.js",
41+
"codacy": "istanbul cover _mocha -- -u exports -R spec ./test/**/* && cat ./coverage/lcov.info | codacy-coverage"
4242
},
4343
"bin": {
4444
"diff2html": "./bin/diff2html"
4545
},
4646
"main": "./src/main.js",
4747
"dependencies": {
48-
"copy-paste": "^1.1.4",
49-
"diff2html": "^2.0.0-beta10",
48+
"copy-paste": "^1.2.0",
49+
"diff2html": "^2.0.0-beta18",
5050
"extend": "^3.0.0",
5151
"open": "0.0.5",
52-
"request": "^2.69.0",
53-
"yargs": "^4.3.2"
52+
"request": "^2.72.0",
53+
"yargs": "^4.7.0"
5454
},
5555
"devDependencies": {
5656
"codacy-coverage": "^1.1.3",
57-
"istanbul": "^0.4.2",
58-
"jscs": "^2.11.0",
57+
"istanbul": "^0.4.3",
58+
"jscs": "^3.0.3",
5959
"mocha": "^2.4.5"
6060
},
6161
"license": "MIT",

‎src/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ var argv = yargs.usage('Usage: diff2html [options] -- [diff args]')
129129
})
130130
.help('h')
131131
.alias('h', 'help')
132-
.epilog('© 2014 rtfpessoa\n' +
132+
.epilog('© 2014-2016 rtfpessoa\n' +
133133
'For support, check out https://github.com/rtfpessoa/diff2html-cli')
134134
.argv;
135135

0 commit comments

Comments
 (0)