Fossil SCM

Fix over-length source code lines in timeline.c.

drh 2017-12-06 18:02 trunk
Commit d7435bc283e9f39b941c1fb0d4f4caea91fd02e3b2ce2856315a5851a9f41e61
Parent 68635d60dff02af…
1 file changed +10 -5
~ src/timeline.c
M src/timeline.c
+10 -5
--- src/timeline.c
+++ src/timeline.c
@@ -435,11 +435,12 @@
435435
 db_reset(&qbranch);
436436
 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
437437
 }
438438
 @</td>
439439
 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
440
- @ <td class="timeline%s(zStyle)Cell" style="background-color: %h(zBgClr);">
440
+ @ <td class="timeline%s(zStyle)Cell" \
441
+ @ style="background-color: %h(zBgClr);">
441442
 }else{
442443
 @ <td class="timeline%s(zStyle)Cell">
443444
 }
444445
 if( pGraph && zType[0]!='c' ){
445446
 @ &bull;
@@ -525,11 +526,12 @@
525526
526527
 /* Generate extra information and hyperlinks to follow the comment.
527528
 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
528529
 */
529530
 if( drawDetailEllipsis ){
530
- @ <span class='timelineEllipsis' id='ellipsis-%d(rid)' data-id='%d(rid)'>...</span>
531
+ @ <span class='timelineEllipsis' id='ellipsis-%d(rid)'\
532
+ @ data-id='%d(rid)'>...</span>
531533
 }
532534
 if( tmFlags & TIMELINE_COLUMNAR ){
533535
 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
534536
 @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
535537
 }else{
@@ -722,11 +724,12 @@
722724
 @ <tr class="timelineBottom"><td></td><td></td><td></td></tr>
723725
 }
724726
 }
725727
 @ </table>
726728
 if( fchngQueryInit ) db_finalize(&fchngQuery);
727
- timeline_output_graph_javascript(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0, iTableId, 0);
729
+ timeline_output_graph_javascript(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0,
730
+ iTableId, 0);
728731
 }
729732
730733
 /*
731734
 ** Change the RGB background color given in the argument in a foreground
732735
 ** color with the same hue.
@@ -1027,11 +1030,12 @@
10271030
 style_submenu_multichoice("y", i/2, az, isDisabled);
10281031
 }
10291032
 }
10301033
10311034
 /*
1032
-** Convert the current "ss" display preferences cookie into an appropriate TIMELINE_* flag
1035
+** Convert the current "ss" display preferences cookie into an
1036
+** appropriate TIMELINE_* flag
10331037
 */
10341038
 int timeline_ss_cookie(void){
10351039
 int tmFlags;
10361040
 switch( cookie_value("ss","m")[0] ){
10371041
 case 'c': tmFlags = TIMELINE_COMPACT; break;
@@ -2214,11 +2218,12 @@
22142218
22152219
 /*
22162220
 ** Return true if the input string can be converted to a julianday.
22172221
 */
22182222
 static int fossil_is_julianday(const char *zDate){
2219
- return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd WHERE jd IS NOT NULL)", zDate);
2223
+ return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd"
2224
+ " WHERE jd IS NOT NULL)", zDate);
22202225
 }
22212226
22222227
 /*
22232228
 ** COMMAND: timeline
22242229
 **
22252230
--- src/timeline.c
+++ src/timeline.c
@@ -435,11 +435,12 @@
435 db_reset(&qbranch);
436 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
437 }
438 @</td>
439 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
440 @ <td class="timeline%s(zStyle)Cell" style="background-color: %h(zBgClr);">
 
441 }else{
442 @ <td class="timeline%s(zStyle)Cell">
443 }
444 if( pGraph && zType[0]!='c' ){
445 @ &bull;
@@ -525,11 +526,12 @@
525
526 /* Generate extra information and hyperlinks to follow the comment.
527 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
528 */
529 if( drawDetailEllipsis ){
530 @ <span class='timelineEllipsis' id='ellipsis-%d(rid)' data-id='%d(rid)'>...</span>
 
531 }
532 if( tmFlags & TIMELINE_COLUMNAR ){
533 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
534 @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
535 }else{
@@ -722,11 +724,12 @@
722 @ <tr class="timelineBottom"><td></td><td></td><td></td></tr>
723 }
724 }
725 @ </table>
726 if( fchngQueryInit ) db_finalize(&fchngQuery);
727 timeline_output_graph_javascript(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0, iTableId, 0);
 
728 }
729
730 /*
731 ** Change the RGB background color given in the argument in a foreground
732 ** color with the same hue.
@@ -1027,11 +1030,12 @@
1027 style_submenu_multichoice("y", i/2, az, isDisabled);
1028 }
1029 }
1030
1031 /*
1032 ** Convert the current "ss" display preferences cookie into an appropriate TIMELINE_* flag
 
1033 */
1034 int timeline_ss_cookie(void){
1035 int tmFlags;
1036 switch( cookie_value("ss","m")[0] ){
1037 case 'c': tmFlags = TIMELINE_COMPACT; break;
@@ -2214,11 +2218,12 @@
2214
2215 /*
2216 ** Return true if the input string can be converted to a julianday.
2217 */
2218 static int fossil_is_julianday(const char *zDate){
2219 return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd WHERE jd IS NOT NULL)", zDate);
 
2220 }
2221
2222 /*
2223 ** COMMAND: timeline
2224 **
2225
--- src/timeline.c
+++ src/timeline.c
@@ -435,11 +435,12 @@
435 db_reset(&qbranch);
436 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
437 }
438 @</td>
439 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
440 @ <td class="timeline%s(zStyle)Cell" \
441 @ style="background-color: %h(zBgClr);">
442 }else{
443 @ <td class="timeline%s(zStyle)Cell">
444 }
445 if( pGraph && zType[0]!='c' ){
446 @ &bull;
@@ -525,11 +526,12 @@
526
527 /* Generate extra information and hyperlinks to follow the comment.
528 ** Example: "(check-in: [abcdefg], user: drh, tags: trunk)"
529 */
530 if( drawDetailEllipsis ){
531 @ <span class='timelineEllipsis' id='ellipsis-%d(rid)'\
532 @ data-id='%d(rid)'>...</span>
533 }
534 if( tmFlags & TIMELINE_COLUMNAR ){
535 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
536 @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
537 }else{
@@ -722,11 +724,12 @@
724 @ <tr class="timelineBottom"><td></td><td></td><td></td></tr>
725 }
726 }
727 @ </table>
728 if( fchngQueryInit ) db_finalize(&fchngQuery);
729 timeline_output_graph_javascript(pGraph, (tmFlags & TIMELINE_DISJOINT)!=0,
730 iTableId, 0);
731 }
732
733 /*
734 ** Change the RGB background color given in the argument in a foreground
735 ** color with the same hue.
@@ -1027,11 +1030,12 @@
1030 style_submenu_multichoice("y", i/2, az, isDisabled);
1031 }
1032 }
1033
1034 /*
1035 ** Convert the current "ss" display preferences cookie into an
1036 ** appropriate TIMELINE_* flag
1037 */
1038 int timeline_ss_cookie(void){
1039 int tmFlags;
1040 switch( cookie_value("ss","m")[0] ){
1041 case 'c': tmFlags = TIMELINE_COMPACT; break;
@@ -2214,11 +2218,12 @@
2218
2219 /*
2220 ** Return true if the input string can be converted to a julianday.
2221 */
2222 static int fossil_is_julianday(const char *zDate){
2223 return db_int(0, "SELECT EXISTS (SELECT julianday(%Q) AS jd"
2224 " WHERE jd IS NOT NULL)", zDate);
2225 }
2226
2227 /*
2228 ** COMMAND: timeline
2229 **
2230

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button