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

Merge pull request #226 from rtfpessoa/update-configurations

Browse source 
fix: Update typescript typings and default configuration options
This commit is contained in:
Rodrigo Fernandes 2019-07-03 20:49:24 +01:00 committed by GitHub
commit faeb7b7e80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/diff2html.js
View file

@ -14,13 +14,16 @@
} }
var defaultConfig = { var defaultConfig = {
wordByWord: true, inputFormat: 'diff',
outputFormat: 'line-by-line', outputFormat: 'line-by-line',
showFiles: false,
matching: 'none', matching: 'none',
matchWordsThreshold: 0.25, matchWordsThreshold: 0.25,
matchingMaxComparisons: 2500, matchingMaxComparisons: 2500,
maxLineSizeInBlockForComparison: 200, maxLineSizeInBlockForComparison: 200,
maxLineLengthHighlight: 10000, maxLineLengthHighlight: 10000,
templates: {},
rawTemplates: {},
renderNothingWhenEmpty: false renderNothingWhenEmpty: false
}; };

18
typescript/diff2html-tests.ts
View file

@ -5,18 +5,18 @@ import Diff2Html = require('diff2html');
let d2h = Diff2Html.Diff2Html; let d2h = Diff2Html.Diff2Html;
class Diff2HtmlOptionsImpl implements Diff2Html.Options { class Diff2HtmlOptionsImpl implements Diff2Html.Options {
constructor(public inputFormat: string) { constructor (public inputFormat: 'diff' | 'json') {
} }
} }
let strInput = let strInput =
'diff --git a/sample b/sample\n' + 'diff --git a/sample b/sample\n' +
'index 0000001..0ddf2ba\n' + 'index 0000001..0ddf2ba\n' +
'--- a/sample\n' + '--- a/sample\n' +
'+++ b/sample\n' + '+++ b/sample\n' +
'@@ -1 +1 @@\n' + '@@ -1 +1 @@\n' +
'-test\n' + '-test\n' +
'+test1r\n'; '+test1r\n';
let strConfiguration = new Diff2HtmlOptionsImpl('diff'); let strConfiguration = new Diff2HtmlOptionsImpl('diff');
let diffInput = d2h.getJsonFromDiff(strInput, strConfiguration); let diffInput = d2h.getJsonFromDiff(strInput, strConfiguration);

11
typescript/diff2html.d.ts vendored
View file

@ -6,14 +6,17 @@
declare namespace Diff2Html { declare namespace Diff2Html {
export interface Options { export interface Options {
inputFormat?: string; inputFormat?: 'diff' | 'json';
outputFormat?: string; outputFormat?: 'line-by-line' | 'side-by-side';
showFiles?: boolean; showFiles?: boolean;
matching?: string; matching?: 'lines' | 'words' | 'none';
synchronisedScroll?: boolean;
matchWordsThreshold?: number; matchWordsThreshold?: number;
matchingMaxComparisons?: number; matchingMaxComparisons?: number;
maxLineSizeInBlockForComparison?: number;
maxLineLengthHighlight?: number; maxLineLengthHighlight?: number;
templates?: object;
rawTemplates?: object;
renderNothingWhenEmpty?: boolean;
} }
export interface Line { export interface Line {