Skip to content

Commit 33afd1a

Browse files
committed
Initial use of diff2html
1 parent 10f285a commit 33afd1a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

app/app.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<link href="https://cdnjs.cloudflare.com/ajax/libs/loaders.css/0.1.2/loaders.min.css" rel="stylesheet" />
99
<link href="https://cdnjs.cloudflare.com/ajax/libs/react-datepicker/0.47.0/react-datepicker.min.css" rel="stylesheet" />
1010
<link href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/github.min.css" type="text/css" />
11-
<link href="https://cdnjs.cloudflare.com/ajax/libs/diff2html/2.3.0/diff2html.min.js" type="text/css" />
11+
<link href="https://cdn.rawgit.com/rtfpessoa/diff2html/master/dist/diff2html.min.css" type="text/css" />
1212
<script>
1313
(function() {
1414
if (!process.env.HOT) {
@@ -51,6 +51,7 @@
5151
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
5252
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
5353
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/languages/scala.min.js"></script>
54+
<script src="https://cdnjs.cloudflare.com/ajax/libs/diff2html/2.3.0/diff2html-ui.min.js"></script>
5455
<script src="https://cdnjs.cloudflare.com/ajax/libs/diff2html/2.3.0/diff2html.min.js"></script>
5556
</body>
5657
</html>

app/components/SvnRevisionList.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export default class SvnRevisionList extends Component {
6262
}
6363

6464
generateDiffTest(revisionSelected) {
65+
this.props.startRevisionLoading(true);
6566
console.log('revisionSelected: ', revisionSelected);
6667
diffSvn2Git.parse(revisionSelected).then((patch) => {
6768
console.log('Patch result: ');
@@ -71,6 +72,7 @@ export default class SvnRevisionList extends Component {
7172
console.log(diff2HtmlResult);
7273

7374
this.setState({ prettyDiffHtml: diff2HtmlResult });
75+
this.props.startRevisionLoading(false);
7476
});
7577
}
7678

@@ -81,7 +83,9 @@ export default class SvnRevisionList extends Component {
8183
style={styles.fileName}
8284
>
8385
<i className="material-icons">label</i>
84-
<p role="button" onClick={this.generateDiffTest(revision.$.revision)}>{`r${revision.$.revision} | ${dateFormat(revision.date, 'dd/mm/yyyy HH:MM:ss')} | ${revision.author} | ${revision.msg}`}</p>
86+
<p role="button" onClick={() => this.generateDiffTest(revision.$.revision)}>
87+
{`r${revision.$.revision} | ${dateFormat(revision.date, 'dd/mm/yyyy HH:MM:ss')} | ${revision.author} | ${revision.msg}`}
88+
</p>
8589
</div>
8690
</li>
8791
);

0 commit comments

Comments
 (0)