luciano/diff2html
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 70b2d5620f into 5b8ef31d76

Browse source
This commit is contained in:
hellojukay 2017-10-23 03:16:00 +00:00 committed by GitHub
commit 3e24ef5437
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
README.md
View file

@ -36,6 +36,8 @@ diff2html generates pretty HTML diffs from git or unified diff output.
* Easy code selection * Easy code selection
* Support Angular4
## Online Example ## Online Example
> Go to [diff2html](https://diff2html.xyz/) > Go to [diff2html](https://diff2html.xyz/)
@ -71,9 +73,50 @@ It will now be available as a global variable named `Diff2Html`.
### Node Module ### Node Module
```js ```js
// import diff2html
let diff2html = require("diff2html").Diff2Html let diff2html = require("diff2html").Diff2Html
``` ```
### Using ing Angular4
in typescript file
```typescript
// import diff2html
import {Diff2Html} from 'diff2html'
import {Component, OnInit} from '@angular/core';
export class AppDiffComponent implements OnInit {
outputHtml: string;
constructor() {
this.init();
}
ngOnInit() {
}
init() {
inputFormat = "--- a/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n+++ b/server/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go\n@@ -1035,6 +1035,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (\n \n // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n \n+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {\n+\tr0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))\n+\tn = int(r0)\n+\tif e1 != 0 {\n+\t\terr = errnoErr(e1)\n+\t}\n+\treturn\n+}\n+\n+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n+\n func read(fd int, p []byte) (n int, err error) {\n \tvar _p0 unsafe.Pointer\n \tif len(p) > 0 {\n";
let outputHtml = Diff2Html.getPrettyHtml(strInput, {inputFormat: 'diff', showFiles: true, matching: 'lines'});
this.outputHtml = outputHtml;
}
```
in html file
```html
<html>
<body>
<div [innerHtml]="outputHtml"></div>
</body>
</html>
```
in .angular-cli.json, add styles node in app node.
```json
"styles": [
"styles.scss",
"d2h.css"
]
```
## API ## API
> Intermediate Json From Git Word Diff Output > Intermediate Json From Git Word Diff Output