Fossil SCM
Do not redirect "diff" links on the "Show Files" option of the timeline to a different window. If the user wants to show the diff in a different window, let them click while holding down the Shift key.
Commit
71a916ee9507d6fbdcaf84a38176b46db19ef723
Parent
59d70140f69e980…
1 file changed
+3
-6
+3
-6
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -497,26 +497,23 @@ | ||
| 497 | 497 | } |
| 498 | 498 | continue; |
| 499 | 499 | } |
| 500 | 500 | if( isNew ){ |
| 501 | 501 | @ <li> %h(zFilename) (new file) |
| 502 | - @ %z(xhref("target='diffwindow'","%R/artifact/%S",zNew)) | |
| 503 | - @ [view]</a></li> | |
| 502 | + @ %z(href("%R/artifact/%S",zNew))[view]</a></li> | |
| 504 | 503 | }else if( isDel ){ |
| 505 | 504 | @ <li> %h(zFilename) (deleted)</li> |
| 506 | 505 | }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ |
| 507 | 506 | @ <li> %h(zOldName) → %h(zFilename) |
| 508 | - @ %z(xhref("target='diffwindow'","%R/artifact/%S",zNew)) | |
| 509 | - @ [view]</a></li> | |
| 507 | + @ %z(href("%R/artifact/%S",zNew))[view]</a></li> | |
| 510 | 508 | }else{ |
| 511 | 509 | if( zOldName!=0 ){ |
| 512 | 510 | @ <li> %h(zOldName) → %h(zFilename) |
| 513 | 511 | }else{ |
| 514 | 512 | @ <li> %h(zFilename) |
| 515 | 513 | } |
| 516 | - @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew)) | |
| 517 | - @ [diff]</a></li> | |
| 514 | + @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a></li> | |
| 518 | 515 | } |
| 519 | 516 | } |
| 520 | 517 | db_reset(&fchngQuery); |
| 521 | 518 | if( inUl ){ |
| 522 | 519 | @ </ul> |
| 523 | 520 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -497,26 +497,23 @@ | |
| 497 | } |
| 498 | continue; |
| 499 | } |
| 500 | if( isNew ){ |
| 501 | @ <li> %h(zFilename) (new file) |
| 502 | @ %z(xhref("target='diffwindow'","%R/artifact/%S",zNew)) |
| 503 | @ [view]</a></li> |
| 504 | }else if( isDel ){ |
| 505 | @ <li> %h(zFilename) (deleted)</li> |
| 506 | }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ |
| 507 | @ <li> %h(zOldName) → %h(zFilename) |
| 508 | @ %z(xhref("target='diffwindow'","%R/artifact/%S",zNew)) |
| 509 | @ [view]</a></li> |
| 510 | }else{ |
| 511 | if( zOldName!=0 ){ |
| 512 | @ <li> %h(zOldName) → %h(zFilename) |
| 513 | }else{ |
| 514 | @ <li> %h(zFilename) |
| 515 | } |
| 516 | @ %z(xhref("target='diffwindow'","%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew)) |
| 517 | @ [diff]</a></li> |
| 518 | } |
| 519 | } |
| 520 | db_reset(&fchngQuery); |
| 521 | if( inUl ){ |
| 522 | @ </ul> |
| 523 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -497,26 +497,23 @@ | |
| 497 | } |
| 498 | continue; |
| 499 | } |
| 500 | if( isNew ){ |
| 501 | @ <li> %h(zFilename) (new file) |
| 502 | @ %z(href("%R/artifact/%S",zNew))[view]</a></li> |
| 503 | }else if( isDel ){ |
| 504 | @ <li> %h(zFilename) (deleted)</li> |
| 505 | }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){ |
| 506 | @ <li> %h(zOldName) → %h(zFilename) |
| 507 | @ %z(href("%R/artifact/%S",zNew))[view]</a></li> |
| 508 | }else{ |
| 509 | if( zOldName!=0 ){ |
| 510 | @ <li> %h(zOldName) → %h(zFilename) |
| 511 | }else{ |
| 512 | @ <li> %h(zFilename) |
| 513 | } |
| 514 | @ %z(href("%R/fdiff?v1=%S&v2=%S&sbs=1",zOld,zNew))[diff]</a></li> |
| 515 | } |
| 516 | } |
| 517 | db_reset(&fchngQuery); |
| 518 | if( inUl ){ |
| 519 | @ </ul> |
| 520 |