Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Add a side-by-side diff option to the skin editor. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
523c548b2e236412acc94fb30f5ecea2 |
User & Date: | drh 2017-12-04 16:23:02.388 |
Context
2017-12-04
| ||
16:42 | Remove ".timelineSpacer" rows surrounding the select row on a timeline. ... (check-in: 38b223df user: drh tags: trunk) | |
16:23 | Add a side-by-side diff option to the skin editor. ... (check-in: 523c548b user: drh tags: trunk) | |
16:13 | More initialization and diff options for skin editing. ... (check-in: c6ee75a9 user: drh tags: trunk) | |
Changes
Changes to src/skins.c.
︙ | ︙ | |||
761 762 763 764 765 766 767 | 0 /* Disabled flag */ ); @ <br /> @ <input type="submit" name="submit" value="Apply Changes" /> @ <hr /> @ Baseline: \ skin_emit_skin_selector("basis", zBasis, zDraft); | | > | > | 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 | 0 /* Disabled flag */ ); @ <br /> @ <input type="submit" name="submit" value="Apply Changes" /> @ <hr /> @ Baseline: \ skin_emit_skin_selector("basis", zBasis, zDraft); @ <input type="submit" name="diff" value="Unified Diff" /> @ <input type="submit" name="sbsdiff" value="Side-by-Side Diff" /> if( P("diff")!=0 || P("sbsdiff")!=0 ){ u64 diffFlags = construct_diff_flags(0,0) | DIFF_STRIP_EOLCR; Blob from, to, out; if( P("sbsdiff")!=0 ) diffFlags |= DIFF_SIDEBYSIDE; blob_init(&to, zContent, -1); blob_init(&from, skin_file_content(zBasis, zFile), -1); blob_zero(&out); if( diffFlags & DIFF_SIDEBYSIDE ){ text_diff(&from, &to, &out, 0, diffFlags | DIFF_HTML | DIFF_NOTTOOBIG); @ %s(blob_str(&out)) }else{ |
︙ | ︙ |