Release version 2.0.0-rc.6

This commit is contained in:
Rodrigo Fernandes 2016-05-26 16:33:51 +01:00
parent ae39ce97b6
commit 730dccf069
6 changed files with 39 additions and 6 deletions

View file

@ -1,6 +1,6 @@
{
"name": "diff2html",
"version": "2.0.0-rc.5",
"version": "2.0.0-rc.6",
"homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML",
"keywords": [

14
dist/diff2html-ui.js vendored
View file

@ -36,8 +36,22 @@
var cfg = config || {};
var $target = this._getTarget(targetId);
$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) {
var $target = this._getTarget(targetId);

File diff suppressed because one or more lines are too long

21
dist/diff2html.css vendored
View file

@ -16,6 +16,8 @@
}
.d2h-file-stats {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
margin-left: auto;
font-size: 14px;
@ -41,7 +43,11 @@
}
.d2h-file-name-wrapper {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
width: 100%;
font-family: "Source Sans Pro", "Helvetica Neue", Helvetica, Arial, sans-serif;
@ -242,6 +248,8 @@
}
.d2h-file-list-line {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
text-align: left;
}
@ -300,6 +308,8 @@
}
.d2h-tag {
display: -webkit-box;
display: -ms-flexbox;
display: flex;
font-size: 10px;
margin-left: 5px;
@ -337,12 +347,21 @@
.selecting-right td.d2h-code-side-linenumber * {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.selecting-left .d2h-code-line::-moz-selection,
.selecting-left .d2h-code-line *::-moz-selection
.selecting-right td.d2h-code-linenumber::-moz-selection,
.selecting-left .d2h-code-side-line::-moz-selection,
.selecting-left .d2h-code-side-line *::-moz-selection,
.selecting-right td.d2h-code-side-linenumber::-moz-selection,
.selecting-right td.d2h-code-side-linenumber *::-moz-selection {
background: transparent;
}
.selecting-left .d2h-code-line::selection,
.selecting-left .d2h-code-line *::selection
.selecting-right td.d2h-code-linenumber::selection,

File diff suppressed because one or more lines are too long

View file

@ -1,6 +1,6 @@
{
"name": "diff2html",
"version": "2.0.0-rc.5",
"version": "2.0.0-rc.6",
"homepage": "http://rtfpessoa.github.io/diff2html/",
"description": "Fast Diff to colorized HTML",
"keywords": [