diff options
author | Tim Chen | 2012-01-03 16:09:59 +0000 |
---|---|---|
committer | Lars Hjemli | 2012-01-03 16:09:59 +0000 |
commit | 195742572681d6c2583de392131d1be86ef52f48 (patch) | |
tree | ff02d05e91dccefefab3ffa5b34b099b0e6f7f21 | |
parent | Merge branch 'stable' (diff) | |
download | cgit-195742572681d6c2583de392131d1be86ef52f48.tar.gz cgit-195742572681d6c2583de392131d1be86ef52f48.zip |
ui-ssdiff.c: set correct diffmode in "control panel"
When side-by-side-diffs=1 was set in cgitrc, specifying 'ss=0' in the querystring would not set the 'unified' option as active in the dropdown box used to select diffmode.
-rw-r--r-- | ui-diff.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ui-diff.c b/ui-diff.c index af24a6c..c6bad63 100644 --- a/ui-diff.c +++ b/ui-diff.c | |||
@@ -341,9 +341,7 @@ void cgit_print_diff_ctrls() | |||
341 | html("<td class='label'>mode:</td>"); | 341 | html("<td class='label'>mode:</td>"); |
342 | html("<td class='ctrl'>"); | 342 | html("<td class='ctrl'>"); |
343 | html("<select name='ss' onchange='this.form.submit();'>"); | 343 | html("<select name='ss' onchange='this.form.submit();'>"); |
344 | curr = ctx.qry.ssdiff; | 344 | curr = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff; |
345 | if (!curr && ctx.cfg.ssdiff) | ||
346 | curr = 1; | ||
347 | html_intoption(0, "unified", curr); | 345 | html_intoption(0, "unified", curr); |
348 | html_intoption(1, "ssdiff", curr); | 346 | html_intoption(1, "ssdiff", curr); |
349 | html("</select></td></tr>"); | 347 | html("</select></td></tr>"); |