Fossil SCM
When displaying wiki diffs side-by-side, also include javascript for synchronised scrolling.
Commit
542178d348d8c15d7b056af87ad3c6ad1eb256af220ac57763cbb8545e213461
Parent
b6e7473f95676c6…
1 file changed
+9
-6
+9
-6
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -861,11 +861,11 @@ | ||
| 861 | 861 | /* |
| 862 | 862 | ** Function called to output extra text at the end of each line in |
| 863 | 863 | ** a wiki history listing. |
| 864 | 864 | */ |
| 865 | 865 | static void wiki_history_extra(int rid){ |
| 866 | - if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ | |
| 866 | + if( g.perm.Hyperlink && db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ | |
| 867 | 867 | @ %z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))[diff]</a> |
| 868 | 868 | } |
| 869 | 869 | } |
| 870 | 870 | |
| 871 | 871 | /* |
| @@ -943,17 +943,20 @@ | ||
| 943 | 943 | }else{ |
| 944 | 944 | style_submenu_element("Side-by-side Diff", "%R/wdiff?name=%T&a=%d&b=%d&diff=2", |
| 945 | 945 | zPageName, rid1, rid2); |
| 946 | 946 | } |
| 947 | 947 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 948 | - if( diffType==2){ | |
| 949 | - @ <pre class="sbsdiff"> | |
| 948 | + if( diffType==2 ){ | |
| 949 | + @ <pre class="sbsdiff"> | |
| 950 | + @ %s(blob_str(&d)) | |
| 951 | + @ <pre> | |
| 952 | + style_load_one_js_file("sbsdiff.js"); | |
| 950 | 953 | }else{ |
| 951 | - @ <pre class="udiff"> | |
| 954 | + @ <pre class="udiff"> | |
| 955 | + @ %s(blob_str(&d)) | |
| 956 | + @ <pre> | |
| 952 | 957 | } |
| 953 | - @ %s(blob_str(&d)) | |
| 954 | - @ <pre> | |
| 955 | 958 | manifest_destroy(pW1); |
| 956 | 959 | manifest_destroy(pW2); |
| 957 | 960 | style_footer(); |
| 958 | 961 | } |
| 959 | 962 | |
| 960 | 963 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -861,11 +861,11 @@ | |
| 861 | /* |
| 862 | ** Function called to output extra text at the end of each line in |
| 863 | ** a wiki history listing. |
| 864 | */ |
| 865 | static void wiki_history_extra(int rid){ |
| 866 | if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ |
| 867 | @ %z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))[diff]</a> |
| 868 | } |
| 869 | } |
| 870 | |
| 871 | /* |
| @@ -943,17 +943,20 @@ | |
| 943 | }else{ |
| 944 | style_submenu_element("Side-by-side Diff", "%R/wdiff?name=%T&a=%d&b=%d&diff=2", |
| 945 | zPageName, rid1, rid2); |
| 946 | } |
| 947 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 948 | if( diffType==2){ |
| 949 | @ <pre class="sbsdiff"> |
| 950 | }else{ |
| 951 | @ <pre class="udiff"> |
| 952 | } |
| 953 | @ %s(blob_str(&d)) |
| 954 | @ <pre> |
| 955 | manifest_destroy(pW1); |
| 956 | manifest_destroy(pW2); |
| 957 | style_footer(); |
| 958 | } |
| 959 | |
| 960 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -861,11 +861,11 @@ | |
| 861 | /* |
| 862 | ** Function called to output extra text at the end of each line in |
| 863 | ** a wiki history listing. |
| 864 | */ |
| 865 | static void wiki_history_extra(int rid){ |
| 866 | if( g.perm.Hyperlink && db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){ |
| 867 | @ %z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))[diff]</a> |
| 868 | } |
| 869 | } |
| 870 | |
| 871 | /* |
| @@ -943,17 +943,20 @@ | |
| 943 | }else{ |
| 944 | style_submenu_element("Side-by-side Diff", "%R/wdiff?name=%T&a=%d&b=%d&diff=2", |
| 945 | zPageName, rid1, rid2); |
| 946 | } |
| 947 | text_diff(&w2, &w1, &d, 0, diffFlags | DIFF_HTML | DIFF_LINENO); |
| 948 | if( diffType==2 ){ |
| 949 | @ <pre class="sbsdiff"> |
| 950 | @ %s(blob_str(&d)) |
| 951 | @ <pre> |
| 952 | style_load_one_js_file("sbsdiff.js"); |
| 953 | }else{ |
| 954 | @ <pre class="udiff"> |
| 955 | @ %s(blob_str(&d)) |
| 956 | @ <pre> |
| 957 | } |
| 958 | manifest_destroy(pW1); |
| 959 | manifest_destroy(pW2); |
| 960 | style_footer(); |
| 961 | } |
| 962 | |
| 963 |