Fossil SCM

Set the color of graph comment boxes using javascript, instead of in-line CSS.

drh 2017-12-06 22:38 trunk
Commit 5a6fe06cd53b2da576e1c424e021f86955e0ecf0759bd9633a4066e33b8af7d5
Parent f924823986dc62d…
3 files changed +2 -3 +6 +3 -4
~ src/finfo.c ~ src/graph.js ~ src/timeline.c
M src/finfo.c
+2 -3
--- src/finfo.c
+++ src/finfo.c
@@ -523,12 +523,11 @@
523523
 @ <td class="timelineTime">\
524524
 @ %z(href("%R/artifact/%!S",zUuid))%s(zTime)</a></td>
525525
 @ <td class="timelineGraph"><div id="m%d(gidx)" class="tl-nodemark"></div>
526526
 @ </td>
527527
 if( zBgClr && zBgClr[0] ){
528
- @ <td class="timeline%s(zStyle)Cell" \
529
- @ style="background-color: %h(zBgClr);">
528
+ @ <td class="timeline%s(zStyle)Cell" id='mc%d(gidx)'>
530529
 }else{
531530
 @ <td class="timeline%s(zStyle)Cell">
532531
 }
533532
 if( tmFlags & TIMELINE_COMPACT ){
534533
 @ <span class='timelineCompactComment' data-id='%d(frid)'>
@@ -546,11 +545,11 @@
546545
 @ id='ellipsis-%d(frid)'>...</span>
547546
 @ <span class='clutter timelineCompactDetail'
548547
 }
549548
 if( tmFlags & TIMELINE_COLUMNAR ){
550549
 if( zBgClr && zBgClr[0] ){
551
- @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
550
+ @ <td class="timelineDetailCell" id='md%d(gidx)'>
552551
 }else{
553552
 @ <td class="timelineDetailCell">
554553
 }
555554
 }
556555
 if( tmFlags & TIMELINE_COMPACT ){
557556
--- src/finfo.c
+++ src/finfo.c
@@ -523,12 +523,11 @@
523 @ <td class="timelineTime">\
524 @ %z(href("%R/artifact/%!S",zUuid))%s(zTime)</a></td>
525 @ <td class="timelineGraph"><div id="m%d(gidx)" class="tl-nodemark"></div>
526 @ </td>
527 if( zBgClr && zBgClr[0] ){
528 @ <td class="timeline%s(zStyle)Cell" \
529 @ style="background-color: %h(zBgClr);">
530 }else{
531 @ <td class="timeline%s(zStyle)Cell">
532 }
533 if( tmFlags & TIMELINE_COMPACT ){
534 @ <span class='timelineCompactComment' data-id='%d(frid)'>
@@ -546,11 +545,11 @@
546 @ id='ellipsis-%d(frid)'>...</span>
547 @ <span class='clutter timelineCompactDetail'
548 }
549 if( tmFlags & TIMELINE_COLUMNAR ){
550 if( zBgClr && zBgClr[0] ){
551 @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
552 }else{
553 @ <td class="timelineDetailCell">
554 }
555 }
556 if( tmFlags & TIMELINE_COMPACT ){
557
--- src/finfo.c
+++ src/finfo.c
@@ -523,12 +523,11 @@
523 @ <td class="timelineTime">\
524 @ %z(href("%R/artifact/%!S",zUuid))%s(zTime)</a></td>
525 @ <td class="timelineGraph"><div id="m%d(gidx)" class="tl-nodemark"></div>
526 @ </td>
527 if( zBgClr && zBgClr[0] ){
528 @ <td class="timeline%s(zStyle)Cell" id='mc%d(gidx)'>
 
529 }else{
530 @ <td class="timeline%s(zStyle)Cell">
531 }
532 if( tmFlags & TIMELINE_COMPACT ){
533 @ <span class='timelineCompactComment' data-id='%d(frid)'>
@@ -546,11 +545,11 @@
545 @ id='ellipsis-%d(frid)'>...</span>
546 @ <span class='clutter timelineCompactDetail'
547 }
548 if( tmFlags & TIMELINE_COLUMNAR ){
549 if( zBgClr && zBgClr[0] ){
550 @ <td class="timelineDetailCell" id='md%d(gidx)'>
551 }else{
552 @ <td class="timelineDetailCell">
553 }
554 }
555 if( tmFlags & TIMELINE_COMPACT ){
556
M src/graph.js
+6
--- src/graph.js
+++ src/graph.js
@@ -202,10 +202,16 @@
202202
 var x = p.x + (p.r<rail ? node.w : -mArrow.w);
203203
 var cls = "arrow merge " + (p.r<rail ? "l" : "r");
204204
 drawBox(cls,null,x,y+(mLine.w-mArrow.h)/2);
205205
 }
206206
 function drawNode(p, btm){
207
+ if( p.bg ){
208
+ var e = document.getElementById("mc"+p.id);
209
+ if(e) e.style.backgroundColor = p.bg;
210
+ e = document.getElementById("md"+p.id);
211
+ if(e) e.style.backgroundColor = p.bg;
212
+ }
207213
 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
208214
 var cls = node.cls;
209215
 if( p.mi.length ) cls += " merge";
210216
 if( p.f&1 ) cls += " leaf";
211217
 var n = drawBox(cls,p.bg,p.x,p.y);
212218
--- src/graph.js
+++ src/graph.js
@@ -202,10 +202,16 @@
202 var x = p.x + (p.r<rail ? node.w : -mArrow.w);
203 var cls = "arrow merge " + (p.r<rail ? "l" : "r");
204 drawBox(cls,null,x,y+(mLine.w-mArrow.h)/2);
205 }
206 function drawNode(p, btm){
 
 
 
 
 
 
207 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
208 var cls = node.cls;
209 if( p.mi.length ) cls += " merge";
210 if( p.f&1 ) cls += " leaf";
211 var n = drawBox(cls,p.bg,p.x,p.y);
212
--- src/graph.js
+++ src/graph.js
@@ -202,10 +202,16 @@
202 var x = p.x + (p.r<rail ? node.w : -mArrow.w);
203 var cls = "arrow merge " + (p.r<rail ? "l" : "r");
204 drawBox(cls,null,x,y+(mLine.w-mArrow.h)/2);
205 }
206 function drawNode(p, btm){
207 if( p.bg ){
208 var e = document.getElementById("mc"+p.id);
209 if(e) e.style.backgroundColor = p.bg;
210 e = document.getElementById("md"+p.id);
211 if(e) e.style.backgroundColor = p.bg;
212 }
213 if( p.u>0 ) drawUpArrow(p,tx.rowinfo[p.u-tx.iTopRow],p.fg);
214 var cls = node.cls;
215 if( p.mi.length ) cls += " merge";
216 if( p.f&1 ) cls += " leaf";
217 var n = drawBox(cls,p.bg,p.x,p.y);
218
M src/timeline.c
+3 -4
--- src/timeline.c
+++ src/timeline.c
@@ -306,10 +306,11 @@
306306
 const char *zBr = 0; /* Branch */
307307
 int commentColumn = 3; /* Column containing comment text */
308308
 int modPending; /* Pending moderation */
309309
 char *zDateLink; /* URL for the link on the timestamp */
310310
 int drawDetailEllipsis; /* True to show ellipsis in place of detail */
311
+ int gidx = 0; /* Graph row identifier */
311312
 char zTime[20];
312313
313314
 if( zDate==0 ){
314315
 zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */
315316
 }
@@ -418,11 +419,10 @@
418419
 }
419420
 }
420421
 if( zType[0]=='c' && (pGraph || (tmFlags & TIMELINE_BRCOLOR)!=0) ){
421422
 int nParent = 0;
422423
 int aParent[GR_MAX_RAIL];
423
- int gidx;
424424
 static Stmt qparent;
425425
 db_static_prepare(&qparent,
426426
 "SELECT pid FROM plink"
427427
 " WHERE cid=:rid AND pid NOT IN phantom"
428428
 " ORDER BY isprim DESC /*sort*/"
@@ -437,12 +437,11 @@
437437
 db_reset(&qbranch);
438438
 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
439439
 }
440440
 @</td>
441441
 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
442
- @ <td class="timeline%s(zStyle)Cell" \
443
- @ style="background-color: %h(zBgClr);">
442
+ @ <td class="timeline%s(zStyle)Cell" id='mc%d(gidx)'>
444443
 }else{
445444
 @ <td class="timeline%s(zStyle)Cell">
446445
 }
447446
 if( pGraph && zType[0]!='c' ){
448447
 @ &bull;
@@ -533,11 +532,11 @@
533532
 @ <span class='timelineEllipsis' id='ellipsis-%d(rid)'\
534533
 @ data-id='%d(rid)'>...</span>
535534
 }
536535
 if( tmFlags & TIMELINE_COLUMNAR ){
537536
 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
538
- @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
537
+ @ <td class="timelineDetailCell" id='md%d(gidx)'>
539538
 }else{
540539
 @ <td class="timelineDetailCell">
541540
 }
542541
 }
543542
 if( tmFlags & TIMELINE_COMPACT ){
544543
--- src/timeline.c
+++ src/timeline.c
@@ -306,10 +306,11 @@
306 const char *zBr = 0; /* Branch */
307 int commentColumn = 3; /* Column containing comment text */
308 int modPending; /* Pending moderation */
309 char *zDateLink; /* URL for the link on the timestamp */
310 int drawDetailEllipsis; /* True to show ellipsis in place of detail */
 
311 char zTime[20];
312
313 if( zDate==0 ){
314 zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */
315 }
@@ -418,11 +419,10 @@
418 }
419 }
420 if( zType[0]=='c' && (pGraph || (tmFlags & TIMELINE_BRCOLOR)!=0) ){
421 int nParent = 0;
422 int aParent[GR_MAX_RAIL];
423 int gidx;
424 static Stmt qparent;
425 db_static_prepare(&qparent,
426 "SELECT pid FROM plink"
427 " WHERE cid=:rid AND pid NOT IN phantom"
428 " ORDER BY isprim DESC /*sort*/"
@@ -437,12 +437,11 @@
437 db_reset(&qbranch);
438 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
439 }
440 @</td>
441 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
442 @ <td class="timeline%s(zStyle)Cell" \
443 @ style="background-color: %h(zBgClr);">
444 }else{
445 @ <td class="timeline%s(zStyle)Cell">
446 }
447 if( pGraph && zType[0]!='c' ){
448 @ &bull;
@@ -533,11 +532,11 @@
533 @ <span class='timelineEllipsis' id='ellipsis-%d(rid)'\
534 @ data-id='%d(rid)'>...</span>
535 }
536 if( tmFlags & TIMELINE_COLUMNAR ){
537 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
538 @ <td class="timelineDetailCell" style="background-color: %h(zBgClr);">
539 }else{
540 @ <td class="timelineDetailCell">
541 }
542 }
543 if( tmFlags & TIMELINE_COMPACT ){
544
--- src/timeline.c
+++ src/timeline.c
@@ -306,10 +306,11 @@
306 const char *zBr = 0; /* Branch */
307 int commentColumn = 3; /* Column containing comment text */
308 int modPending; /* Pending moderation */
309 char *zDateLink; /* URL for the link on the timestamp */
310 int drawDetailEllipsis; /* True to show ellipsis in place of detail */
311 int gidx = 0; /* Graph row identifier */
312 char zTime[20];
313
314 if( zDate==0 ){
315 zDate = "YYYY-MM-DD HH:MM:SS"; /* Something wrong with the repo */
316 }
@@ -418,11 +419,10 @@
419 }
420 }
421 if( zType[0]=='c' && (pGraph || (tmFlags & TIMELINE_BRCOLOR)!=0) ){
422 int nParent = 0;
423 int aParent[GR_MAX_RAIL];
 
424 static Stmt qparent;
425 db_static_prepare(&qparent,
426 "SELECT pid FROM plink"
427 " WHERE cid=:rid AND pid NOT IN phantom"
428 " ORDER BY isprim DESC /*sort*/"
@@ -437,12 +437,11 @@
437 db_reset(&qbranch);
438 @ <div id="m%d(gidx)" class="tl-nodemark"></div>
439 }
440 @</td>
441 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
442 @ <td class="timeline%s(zStyle)Cell" id='mc%d(gidx)'>
 
443 }else{
444 @ <td class="timeline%s(zStyle)Cell">
445 }
446 if( pGraph && zType[0]!='c' ){
447 @ &bull;
@@ -533,11 +532,11 @@
532 @ <span class='timelineEllipsis' id='ellipsis-%d(rid)'\
533 @ data-id='%d(rid)'>...</span>
534 }
535 if( tmFlags & TIMELINE_COLUMNAR ){
536 if( zBgClr && zBgClr[0] && rid!=selectedRid ){
537 @ <td class="timelineDetailCell" id='md%d(gidx)'>
538 }else{
539 @ <td class="timelineDetailCell">
540 }
541 }
542 if( tmFlags & TIMELINE_COMPACT ){
543

Keyboard Shortcuts

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