diff2html/README.md

121 lines
3.4 KiB
Markdown
Raw Normal View History

2014-08-30 02:54:52 +00:00
# Diff to Html by [rtfpessoa](https://github.com/rtfpessoa)
Diff to Html generates pretty HTML diffs from git diff output.
2014-08-30 02:54:52 +00:00
## Features
2014-09-14 19:50:17 +00:00
* `line-by-line` and `side-by-side` diff
2014-08-30 02:54:52 +00:00
* new and old line numbers
2014-08-30 22:33:12 +00:00
* inserted and removed lines
2014-08-30 02:54:52 +00:00
* GitHub like style
2015-07-19 21:34:46 +00:00
* Code syntax highlight
2014-09-14 19:50:17 +00:00
## Online Example
2014-08-30 02:54:52 +00:00
2014-09-08 17:15:51 +00:00
> Go to [Diff2HTML](http://rtfpessoa.github.io/diff2html/)
2014-08-30 22:33:12 +00:00
2014-09-08 17:15:51 +00:00
## Distributions
* [WebJar](http://www.webjars.org/)
* [Node Module](https://www.npmjs.org/package/diff2html)
2015-07-18 23:23:36 +00:00
* [Bower Package](http://bower.io/search/?q=diff2html)
* [Node CLI](https://www.npmjs.org/package/diff2html-cli)
2015-07-18 23:23:36 +00:00
* Manually download and import `dist/diff2html.min.js` into your page
2014-09-08 17:15:51 +00:00
## How to use
> Pretty Line-by-Line Html From Git Word Diff Output
2014-08-30 22:33:12 +00:00
2014-09-14 19:50:17 +00:00
Diff2Html.getPrettyHtmlFromDiff(exInput)
> Pretty Side-by-Side Html From Git Word Diff Output
Diff2Html.getPrettySideBySideHtmlFromDiff(exInput)
2014-08-30 02:54:52 +00:00
2014-08-30 22:33:12 +00:00
> Intermediate Json From Git Word Diff Output
2014-09-14 19:50:17 +00:00
Diff2Html.getJsonFromDiff(exInput)
2014-08-30 22:33:12 +00:00
2014-09-08 17:15:51 +00:00
> Pretty Line-by-Line Html From Json
2014-08-30 22:33:12 +00:00
2014-09-14 19:50:17 +00:00
Diff2Html.getPrettyHtmlFromJson(exInput)
> Pretty Side-by-Side Html From Json
Diff2Html.getPrettySideBySideHtmlFromJson(exInput)
2014-08-30 02:54:52 +00:00
2014-09-08 17:15:51 +00:00
> Check out the `index.html` for a complete example.
2014-08-30 02:54:52 +00:00
## Sintax Hightlight
> Add the dependencies.
Choose one color scheme, and add the main highlight code.
If your favourite language is not included in the default package also add its javascript highlight file.
jQuery is optional, just using it to help managing the highlight.
```html
<!-- Stylesheet -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/styles/github.min.css">
<!-- Javascripts -->
<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/8.6/languages/scala.min.js"></script>
```
> Invoke the highlightjs plugin
```js
document.addEventListener("DOMContentLoaded", function () {
// parse the diff to json
var diffJson = Diff2Html.getJsonFromDiff(lineDiffExample);
// collect all the file extensions in the json
var allFileLanguages = diffJson.map(function (line) {
return line.language;
});
// remove duplicated languages
var distinctLanguages = allFileLanguages.filter(function (v, i) {
return allFileLanguages.indexOf(v) == i;
});
// pass the languages to the highlightjs plugin
hljs.configure({languages: distinctLanguages});
// generate and inject the diff HTML into the desired place
document.getElementById("line-by-line").innerHTML = Diff2Html.getPrettyHtmlFromJson(diffJson);
document.getElementById("side-by-side").innerHTML = Diff2Html.getPrettySideBySideHtmlFromJson(diffJson);
// collect all the code lines and execute the highlight on them
var codeLines = document.getElementsByClassName("d2h-code-line-ctn");
[].forEach.call(codeLines, function (line) {
hljs.highlightBlock(line);
});
});
```
2014-08-30 22:33:12 +00:00
## Contributions
2014-08-30 02:54:52 +00:00
All the contributions are welcome.
To contribute just send a pull request with your changes and I will review it asap.
2014-08-30 02:54:52 +00:00
## License
Copyright 2014 Rodrigo Fernandes. Released under the terms of the MIT license.
2014-08-30 22:33:12 +00:00
## Thanks
This project is inspired in [pretty-diff](https://github.com/scottgonzalez/pretty-diff) by [Scott González](https://github.com/scottgonzalez).
2014-08-30 02:54:52 +00:00
---