Fossil SCM
Minor fix to adapt the `append_diff_javascript()' function and its call points to the new diff logic (already partially done with check-in [1347a1ddb9]).
Commit
f9761abb6aeb92870dc6e1a2489101c922ced01dab55a06d4d833d6c1ed99d4f
Parent
346de5d122a2c28…
1 file changed
+3
-3
+3
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -437,12 +437,12 @@ | ||
| 437 | 437 | } |
| 438 | 438 | |
| 439 | 439 | /* |
| 440 | 440 | ** Generate javascript to enhance HTML diffs. |
| 441 | 441 | */ |
| 442 | -void append_diff_javascript(int sideBySide){ | |
| 443 | - if( !sideBySide ) return; | |
| 442 | +void append_diff_javascript(int diffType){ | |
| 443 | + if( diffType==0 ) return; | |
| 444 | 444 | builtin_request_js("diff.js"); |
| 445 | 445 | } |
| 446 | 446 | |
| 447 | 447 | /* |
| 448 | 448 | ** Construct an appropriate diffFlag for text_diff() based on query |
| @@ -1344,11 +1344,11 @@ | ||
| 1344 | 1344 | pFileTo = manifest_file_next(pTo, 0); |
| 1345 | 1345 | } |
| 1346 | 1346 | } |
| 1347 | 1347 | manifest_destroy(pFrom); |
| 1348 | 1348 | manifest_destroy(pTo); |
| 1349 | - append_diff_javascript(diffType==2); | |
| 1349 | + append_diff_javascript(diffType); | |
| 1350 | 1350 | builtin_fossil_js_bundle_or("info-diff",NULL); |
| 1351 | 1351 | style_finish_page(); |
| 1352 | 1352 | } |
| 1353 | 1353 | |
| 1354 | 1354 | #if INTERFACE |
| 1355 | 1355 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -437,12 +437,12 @@ | |
| 437 | } |
| 438 | |
| 439 | /* |
| 440 | ** Generate javascript to enhance HTML diffs. |
| 441 | */ |
| 442 | void append_diff_javascript(int sideBySide){ |
| 443 | if( !sideBySide ) return; |
| 444 | builtin_request_js("diff.js"); |
| 445 | } |
| 446 | |
| 447 | /* |
| 448 | ** Construct an appropriate diffFlag for text_diff() based on query |
| @@ -1344,11 +1344,11 @@ | |
| 1344 | pFileTo = manifest_file_next(pTo, 0); |
| 1345 | } |
| 1346 | } |
| 1347 | manifest_destroy(pFrom); |
| 1348 | manifest_destroy(pTo); |
| 1349 | append_diff_javascript(diffType==2); |
| 1350 | builtin_fossil_js_bundle_or("info-diff",NULL); |
| 1351 | style_finish_page(); |
| 1352 | } |
| 1353 | |
| 1354 | #if INTERFACE |
| 1355 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -437,12 +437,12 @@ | |
| 437 | } |
| 438 | |
| 439 | /* |
| 440 | ** Generate javascript to enhance HTML diffs. |
| 441 | */ |
| 442 | void append_diff_javascript(int diffType){ |
| 443 | if( diffType==0 ) return; |
| 444 | builtin_request_js("diff.js"); |
| 445 | } |
| 446 | |
| 447 | /* |
| 448 | ** Construct an appropriate diffFlag for text_diff() based on query |
| @@ -1344,11 +1344,11 @@ | |
| 1344 | pFileTo = manifest_file_next(pTo, 0); |
| 1345 | } |
| 1346 | } |
| 1347 | manifest_destroy(pFrom); |
| 1348 | manifest_destroy(pTo); |
| 1349 | append_diff_javascript(diffType); |
| 1350 | builtin_fossil_js_bundle_or("info-diff",NULL); |
| 1351 | style_finish_page(); |
| 1352 | } |
| 1353 | |
| 1354 | #if INTERFACE |
| 1355 |