@@ -84,39 +84,27 @@ var highlightDiff = function(diff, element, callbacks) {
84
84
else if ( startname != endname )
85
85
title = startname + " renamed to " + endname ;
86
86
87
- if ( binary && endname == "/dev/null" ) { // in cases of a deleted binary file, there is no diff/file to display
88
- line1 = "" ;
89
- line2 = "" ;
90
- diffContent = "" ;
91
- file_index ++ ;
92
- startname = "" ;
93
- endname = "" ;
94
- return ; // so printing the filename in the file-list is enough
95
- }
96
-
97
- if ( diffContent != "" || binary ) {
98
- finalContent += '<div class="file" id="file_index_' + ( file_index - 1 ) + '">' +
99
- '<div id="title_' + title + '" class="expanded fileHeader"><a href="javascript:toggleDiff(\'' + title + '\');">' + title + '</a></div>' ;
100
- }
101
-
102
- if ( ! binary && ( diffContent != "" ) ) {
103
- finalContent += '<div id="content_' + title + '" class="diffContent">' +
104
- '<div class="lineno">' + line1 + "</div>" +
105
- '<div class="lineno">' + line2 + "</div>" +
106
- '<div class="lines">' + postProcessDiffContents ( diffContent ) . replace ( / \t / g, " " ) + "</div>" +
107
- '</div>' ;
108
- }
109
- else {
110
- if ( binary ) {
111
- if ( callbacks [ "binaryFile" ] )
112
- finalContent += callbacks [ "binaryFile" ] ( binaryname ) ;
113
- else
114
- finalContent += '<div id="content_' + title + '">Binary file differs</div>' ;
87
+ // Show file list header
88
+ finalContent += '<div class="file" id="file_index_' + ( file_index - 1 ) + '">' ;
89
+ finalContent += '<div id="title_' + title + '" class="expanded fileHeader"><a href="javascript:toggleDiff(\'' + title + '\');">' + title + '</a></div>' ;
90
+
91
+ if ( binary ) {
92
+ // diffContent is assumed to be empty for binary files
93
+ if ( callbacks [ "binaryFile" ] ) {
94
+ finalContent += callbacks [ "binaryFile" ] ( binaryname ) ;
95
+ } else {
96
+ finalContent += '<div id="content_' + title + '">Binary file differs</div>' ;
115
97
}
98
+ } else if ( diffContent != "" ) {
99
+ finalContent += '<div id="content_' + title + '" class="diffContent">' +
100
+ '<div class="lineno">' + line1 + '</div>' +
101
+ '<div class="lineno">' + line2 + '</div>' +
102
+ '<div class="lines">' + postProcessDiffContents ( diffContent ) . replace ( / \t / g, " " ) + '</div>' +
103
+ '</div>' ;
116
104
}
117
105
118
- if ( diffContent != "" || binary )
119
- finalContent += '</div>' + linkToTop ;
106
+ // Close div.file
107
+ finalContent += '</div>' + linkToTop ;
120
108
121
109
line1 = "" ;
122
110
line2 = "" ;
0 commit comments