forked from jhewlett/SourceDiff
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdiff.html
More file actions
132 lines (118 loc) · 2.95 KB
/
diff.html
File metadata and controls
132 lines (118 loc) · 2.95 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
<!DOCTYPE html>
<html>
<head>
<title>Diff test</title>
<link href="../lib/bootstrap.min.css" rel="stylesheet" type="text/css">
<link href="main_style.css" rel="stylesheet" type="text/css">
</head>
<body>
<div class="wrapper">
<div class="left">
<h3>Original</h3>
<textarea id="original">
body {
background-color: #FFFFFF;
}
#wrapper {
/*width: 1310px;*/
width: 100%;
height: 500px;
}
#left {
float: left;
/*width: 650px;*/
width: 49%;
height: 500px;
overflow-x: auto;
overflow-y: auto;
/*margin-right: 10px;*/
margin-right: 2%;
}
#right {
float: right;
/*width: 650px;*/
width: 49%;
height: 500px;
overflow-x: auto;
overflow-y: auto;
}
</textarea>
</div>
<div class="right">
<h3>Edit</h3>
<textarea id="edited">
body {
background-color: #FFFFFF;
}
.text {
width: 50%;
}
.wrapper {
width: 100%;
}
.left {
float: left;
width: 49%;
margin-right: 2%;
}
.scroll {
height: 500px;
overflow-x: auto;
overflow-y: auto;
}
.right {
float: right;
width: 49%;
}
</textarea>
</div>
</div>
<button class="btn" onclick="doDiff()">
<strong>Diff</strong>
</button>
<div class="wrapper">
<div class="left">
<h3>Original</h3>
</div>
<div class="right">
<h3>Edit</h3>
</div>
</div>
<div class="wrapper">
<div class="left scroll" id="scrollLeft">
<pre id="original_result"></pre>
</div>
<div class="right scroll" id="scrollRight">
<pre id="edited_result"></pre>
</div>
</div>
<script src="LineDiff.js"></script>
<script src="EditSet.js"></script>
<script src="LineUtils.js"></script>
<script src="Diff.js"></script>
<script src="DiffFormatter.js"></script>
<script src="LineFormatter.js"></script>
<script src="AnchorIterator.js"></script>
<script>
var scrollLeft = document.getElementById('scrollLeft');
var scrollRight = document.getElementById('scrollRight');
scrollLeft.addEventListener('scroll', function() {
scrollRight.scrollLeft = scrollLeft.scrollLeft;
scrollRight.scrollTop = scrollLeft.scrollTop;
});
scrollRight.addEventListener('scroll', function() {
scrollLeft.scrollLeft = scrollRight.scrollLeft;
scrollLeft.scrollTop = scrollRight.scrollTop;
});
function doDiff() {
var diff = new SourceDiff.Diff(true); //ignore leading whitespace
var formatter = new SourceDiff.DiffFormatter(diff);
var text1 = document.getElementById('original').value;
var text2 = document.getElementById('edited').value;
var results = formatter.formattedDiff(text1, text2);
document.getElementById('original_result').innerHTML = results[0];
document.getElementById('edited_result').innerHTML = results[1];
}
</script>
</body>
</html>