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

Add synchronised horizontal scroll

Browse source
This commit is contained in:
Rafael Cortês 2016-05-21 23:16:43 +01:00
parent dbd8766966
commit 90c9d08744
No known key found for this signature in database
GPG key ID: 5C9F51CF6EE9CF11
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -70,6 +70,7 @@ The HTML output accepts a Javascript object with configuration. Possible options
- `outputFormat`: the format of the output data: `'line-by-line'` or `'side-by-side'`, default is `'line-by-line'` - `outputFormat`: the format of the output data: `'line-by-line'` or `'side-by-side'`, default is `'line-by-line'`
- `showFiles`: show a file list before the diff: `true` or `false`, default is `false` - `showFiles`: show a file list before the diff: `true` or `false`, default is `false`
- `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none` - `matching`: matching level: `'lines'` for matching lines, `'words'` for matching lines and words or `'none'`, default is `none`
- `synchronisedScroll`: scroll both panes in side-by-side mode: `true` or `false`, default is `false`
- `matchWordsThreshold`: similarity threshold for word matching, default is 0.25 - `matchWordsThreshold`: similarity threshold for word matching, default is 0.25
- `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is `2500` - `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is `2500`

2
bower.json
View file

@ -28,9 +28,7 @@
"url": "git://github.com/rtfpessoa/diff2html.git" "url": "git://github.com/rtfpessoa/diff2html.git"
}, },
"main": [ "main": [
"./dist/diff2html-templates.js",
"./dist/diff2html.js", "./dist/diff2html.js",
"./dist/diff2html-ui.js",
"./dist/diff2html.css" "./dist/diff2html.css"
], ],
"license": "MIT", "license": "MIT",

3
sample/index.html
View file

@ -267,7 +267,8 @@
inputFormat: 'json', inputFormat: 'json',
showFiles: true, showFiles: true,
matching: 'lines', matching: 'lines',
outputFormat: 'side-by-side' outputFormat: 'side-by-side',
synchronisedScroll: true
}); });
diff2htmlUi.fileListCloseable('#side-by-side', false); diff2htmlUi.fileListCloseable('#side-by-side', false);
diff2htmlUi.highlightCode('#side-by-side'); diff2htmlUi.highlightCode('#side-by-side');

14
src/ui/js/diff2html-ui.js
View file

@ -34,8 +34,22 @@
var cfg = config || {}; var cfg = config || {};
var $target = this._getTarget(targetId); var $target = this._getTarget(targetId);
$target.html(Diff2Html.getPrettyHtml(diffJson, cfg)); $target.html(Diff2Html.getPrettyHtml(diffJson, cfg));
synchronisedScroll($target, config);
}; };
function synchronisedScroll($target, config) {
if (config.synchronisedScroll) {
$target.find(".d2h-file-side-diff").scroll(function() {
var $this = $(this);
$this.closest(".d2h-file-wrapper").find(".d2h-file-side-diff")
.scrollLeft($this.scrollLeft());
});
}
}
Diff2HtmlUI.prototype.fileListCloseable = function(targetId, startVisible) { Diff2HtmlUI.prototype.fileListCloseable = function(targetId, startVisible) {
var $target = this._getTarget(targetId); var $target = this._getTarget(targetId);