Fossil SCM
reintegrate javascript directly in timeline page but do a proper encoding of the script to prevent validator errors
Commit
24d1d17b46f8464261172339e7e104bf37b8dd8f
Parent
ce06c5e086a3562…
1 file changed
+3
-1
+3
-1
| --- src/timeline.c | ||
| +++ src/timeline.c | ||
| @@ -347,10 +347,11 @@ | ||
| 347 | 347 | if( pGraph && pGraph->nErr==0 ){ |
| 348 | 348 | GraphRow *pRow; |
| 349 | 349 | int i; |
| 350 | 350 | char cSep; |
| 351 | 351 | @ <script type="text/JavaScript"> |
| 352 | + @ /* <![CDATA[ */ | |
| 352 | 353 | cgi_printf("var rowinfo = [\n"); |
| 353 | 354 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 354 | 355 | cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:", |
| 355 | 356 | pRow->idx, |
| 356 | 357 | pRow->zBgClr, |
| @@ -496,11 +497,11 @@ | ||
| 496 | 497 | @ } |
| 497 | 498 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 498 | 499 | @ if( btm<32768 ){ |
| 499 | 500 | @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+ |
| 500 | 501 | @ 'style="position:absolute;left:'+(left-5)+'px;"' + |
| 501 | - @ ' width="'+width+'" height="'+btm+'"></canvas>'; | |
| 502 | + @ ' width="'+width+'" height="'+btm+'"><'+'/canvas>'; | |
| 502 | 503 | @ realCanvas = document.getElementById('timeline-canvas'); |
| 503 | 504 | @ }else{ |
| 504 | 505 | @ realCanvas = 0; |
| 505 | 506 | @ } |
| 506 | 507 | @ var context; |
| @@ -528,10 +529,11 @@ | ||
| 528 | 529 | @ lastY = h; |
| 529 | 530 | @ } |
| 530 | 531 | @ setTimeout("checkHeight();", 1000); |
| 531 | 532 | @ } |
| 532 | 533 | @ checkHeight(); |
| 534 | + @ /* ]]> */ | |
| 533 | 535 | @ </script> |
| 534 | 536 | } |
| 535 | 537 | } |
| 536 | 538 | |
| 537 | 539 | /* |
| 538 | 540 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -347,10 +347,11 @@ | |
| 347 | if( pGraph && pGraph->nErr==0 ){ |
| 348 | GraphRow *pRow; |
| 349 | int i; |
| 350 | char cSep; |
| 351 | @ <script type="text/JavaScript"> |
| 352 | cgi_printf("var rowinfo = [\n"); |
| 353 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 354 | cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:", |
| 355 | pRow->idx, |
| 356 | pRow->zBgClr, |
| @@ -496,11 +497,11 @@ | |
| 496 | @ } |
| 497 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 498 | @ if( btm<32768 ){ |
| 499 | @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+ |
| 500 | @ 'style="position:absolute;left:'+(left-5)+'px;"' + |
| 501 | @ ' width="'+width+'" height="'+btm+'"></canvas>'; |
| 502 | @ realCanvas = document.getElementById('timeline-canvas'); |
| 503 | @ }else{ |
| 504 | @ realCanvas = 0; |
| 505 | @ } |
| 506 | @ var context; |
| @@ -528,10 +529,11 @@ | |
| 528 | @ lastY = h; |
| 529 | @ } |
| 530 | @ setTimeout("checkHeight();", 1000); |
| 531 | @ } |
| 532 | @ checkHeight(); |
| 533 | @ </script> |
| 534 | } |
| 535 | } |
| 536 | |
| 537 | /* |
| 538 |
| --- src/timeline.c | |
| +++ src/timeline.c | |
| @@ -347,10 +347,11 @@ | |
| 347 | if( pGraph && pGraph->nErr==0 ){ |
| 348 | GraphRow *pRow; |
| 349 | int i; |
| 350 | char cSep; |
| 351 | @ <script type="text/JavaScript"> |
| 352 | @ /* <![CDATA[ */ |
| 353 | cgi_printf("var rowinfo = [\n"); |
| 354 | for(pRow=pGraph->pFirst; pRow; pRow=pRow->pNext){ |
| 355 | cgi_printf("{id:\"m%d\",bg:\"%s\",r:%d,d:%d,mo:%d,mu:%d,u:%d,au:", |
| 356 | pRow->idx, |
| 357 | pRow->zBgClr, |
| @@ -496,11 +497,11 @@ | |
| 497 | @ } |
| 498 | @ var btm = absoluteY("grbtm") + 10 - canvasY; |
| 499 | @ if( btm<32768 ){ |
| 500 | @ canvasDiv.innerHTML = '<canvas id="timeline-canvas" '+ |
| 501 | @ 'style="position:absolute;left:'+(left-5)+'px;"' + |
| 502 | @ ' width="'+width+'" height="'+btm+'"><'+'/canvas>'; |
| 503 | @ realCanvas = document.getElementById('timeline-canvas'); |
| 504 | @ }else{ |
| 505 | @ realCanvas = 0; |
| 506 | @ } |
| 507 | @ var context; |
| @@ -528,10 +529,11 @@ | |
| 529 | @ lastY = h; |
| 530 | @ } |
| 531 | @ setTimeout("checkHeight();", 1000); |
| 532 | @ } |
| 533 | @ checkHeight(); |
| 534 | @ /* ]]> */ |
| 535 | @ </script> |
| 536 | } |
| 537 | } |
| 538 | |
| 539 | /* |
| 540 |