Fossil SCM
Disable the timeline graph when using search mode. Ticket [6166fbed08].
Commit
4276853ef88cdf57ea21e493c43cf5fc1ac77e86
Parent
9405e691ad76154…
1 file changed
+4
-1
+4
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -698,11 +698,11 @@ | ||
| 698 | 698 | if( zType[0]=='a' ){ |
| 699 | 699 | tmFlags = TIMELINE_BRIEF | TIMELINE_GRAPH; |
| 700 | 700 | }else{ |
| 701 | 701 | tmFlags = TIMELINE_GRAPH; |
| 702 | 702 | } |
| 703 | - if( P("ng")!=0 ){ | |
| 703 | + if( P("ng")!=0 || zSearch!=0 ){ | |
| 704 | 704 | tmFlags &= ~TIMELINE_GRAPH; |
| 705 | 705 | } |
| 706 | 706 | |
| 707 | 707 | style_header("Timeline"); |
| 708 | 708 | login_anonymous_available(); |
| @@ -891,10 +891,13 @@ | ||
| 891 | 891 | }else if( zBefore ){ |
| 892 | 892 | blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); |
| 893 | 893 | }else if( zCirca ){ |
| 894 | 894 | blob_appendf(&desc, " occurring around %h.<br>", zCirca); |
| 895 | 895 | } |
| 896 | + if( zSearch ){ | |
| 897 | + blob_appendf(&desc, " matching \"%h\"", zSearch); | |
| 898 | + } | |
| 896 | 899 | if( g.okHistory ){ |
| 897 | 900 | if( zAfter || n==nEntry ){ |
| 898 | 901 | zDate = db_text(0, "SELECT min(timestamp) FROM timeline"); |
| 899 | 902 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 900 | 903 | free(zDate); |
| 901 | 904 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -698,11 +698,11 @@ | |
| 698 | if( zType[0]=='a' ){ |
| 699 | tmFlags = TIMELINE_BRIEF | TIMELINE_GRAPH; |
| 700 | }else{ |
| 701 | tmFlags = TIMELINE_GRAPH; |
| 702 | } |
| 703 | if( P("ng")!=0 ){ |
| 704 | tmFlags &= ~TIMELINE_GRAPH; |
| 705 | } |
| 706 | |
| 707 | style_header("Timeline"); |
| 708 | login_anonymous_available(); |
| @@ -891,10 +891,13 @@ | |
| 891 | }else if( zBefore ){ |
| 892 | blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); |
| 893 | }else if( zCirca ){ |
| 894 | blob_appendf(&desc, " occurring around %h.<br>", zCirca); |
| 895 | } |
| 896 | if( g.okHistory ){ |
| 897 | if( zAfter || n==nEntry ){ |
| 898 | zDate = db_text(0, "SELECT min(timestamp) FROM timeline"); |
| 899 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 900 | free(zDate); |
| 901 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -698,11 +698,11 @@ | |
| 698 | if( zType[0]=='a' ){ |
| 699 | tmFlags = TIMELINE_BRIEF | TIMELINE_GRAPH; |
| 700 | }else{ |
| 701 | tmFlags = TIMELINE_GRAPH; |
| 702 | } |
| 703 | if( P("ng")!=0 || zSearch!=0 ){ |
| 704 | tmFlags &= ~TIMELINE_GRAPH; |
| 705 | } |
| 706 | |
| 707 | style_header("Timeline"); |
| 708 | login_anonymous_available(); |
| @@ -891,10 +891,13 @@ | |
| 891 | }else if( zBefore ){ |
| 892 | blob_appendf(&desc, " occurring on or before %h.<br>", zBefore); |
| 893 | }else if( zCirca ){ |
| 894 | blob_appendf(&desc, " occurring around %h.<br>", zCirca); |
| 895 | } |
| 896 | if( zSearch ){ |
| 897 | blob_appendf(&desc, " matching \"%h\"", zSearch); |
| 898 | } |
| 899 | if( g.okHistory ){ |
| 900 | if( zAfter || n==nEntry ){ |
| 901 | zDate = db_text(0, "SELECT min(timestamp) FROM timeline"); |
| 902 | timeline_submenu(&url, "Older", "b", zDate, "a"); |
| 903 | free(zDate); |
| 904 |