Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Minor name refactoring and comment enhancements in graph.js. No logic changes. Improvements to the javascript compressor. Apply compression to "*/js.txt" files in addition to "*.js" files. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
786d6167fa008d1fe37d98e355ea6c56 |
| User & Date: | drh 2019-06-08 14:19:46.235 |
Context
|
2019-06-08
| ||
| 14:48 | Improvements to tooltip behavior in an effort to make it easier to move the mouse over to the "copy button" or to the hyperlink without the tooltip changing out from under the user. ... (check-in: 55f56e91ba user: drh tags: trunk) | |
| 14:19 | Minor name refactoring and comment enhancements in graph.js. No logic changes. Improvements to the javascript compressor. Apply compression to "*/js.txt" files in addition to "*.js" files. ... (check-in: 786d6167fa user: drh tags: trunk) | |
| 10:29 | Fix a minor fault in the graph drawing javascript. ... (check-in: 3a15daaa3f user: drh tags: trunk) | |
Changes
Changes to src/graph.js.
| ︙ | ︙ | |||
97 98 99 100 101 102 103 |
};
/* State information for the tooltip popup and its timers */
window.tooltipInfo = {
dwellTimeout: 250, /* The tooltip dwell timeout. */
closeTimeout: 3000, /* The tooltip close timeout. */
hashDigits: 16, /* Limit of tooltip hashes ("hash-digits"). */
| | | | > > > | > | | | | | | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 |
};
/* State information for the tooltip popup and its timers */
window.tooltipInfo = {
dwellTimeout: 250, /* The tooltip dwell timeout. */
closeTimeout: 3000, /* The tooltip close timeout. */
hashDigits: 16, /* Limit of tooltip hashes ("hash-digits"). */
idTimer: 0, /* The tooltip dwell timer id */
idTimerClose: 0, /* The tooltip close timer id */
ixHover: -1, /* The mouse is over a thick riser arrow for
** tx.rowinfo[ixHover]. Or -2 when the mouse is
** over a graph node. Or -1 when the mouse is not
** over anything. */
ixActive: -1, /* The item shown in the tooltip is tx.rowinfo[ixActive].
** ixActive is -1 if the tooltip is not visible */
nodeHover: null, /* Graph node under mouse when ixHover==-2 */
posX: 0, posY: 0 /* The last mouse position. */
};
/* Functions used to control the tooltip popup and its timer */
function onKeyDown(event){ /* Hide the tooltip when ESC key pressed */
var key = event.which || event.keyCode;
if( key==27 ){
event.stopPropagation();
hideGraphTooltip();
}
}
function hideGraphTooltip(){ /* Hide the tooltip */
document.removeEventListener('keydown',onKeyDown,/* useCapture == */true);
stopCloseTimer();
tooltipObj.style.display = "none";
tooltipInfo.ixActive = -1;
}
document.body.onunload = hideGraphTooltip
function stopDwellTimer(){
if(tooltipInfo.idTimer!=0){
clearTimeout(tooltipInfo.idTimer);
tooltipInfo.idTimer = 0;
}
}
function resumeCloseTimer(){
/* This timer must be stopped explicitly to reset the elapsed timeout. */
if(tooltipInfo.idTimerClose==0 && tooltipInfo.closeTimeout>0) {
tooltipInfo.idTimerClose = setTimeout(function(){
tooltipInfo.idTimerClose = 0;
hideGraphTooltip();
},tooltipInfo.closeTimeout);
}
}
function stopCloseTimer(){
if(tooltipInfo.idTimerClose!=0){
clearTimeout(tooltipInfo.idTimerClose);
tooltipInfo.idTimerClose = 0;
}
}
/* Construct that graph corresponding to the timeline-data-N object that
** is passed in by the tx parameter */
|
| ︙ | ︙ | |||
192 193 194 195 196 197 198 |
if(e.relatedTarget && e.relatedTarget != tooltipObj){
tooltipInfo.ixHover = -1;
hideGraphTooltip();
stopDwellTimer();
stopCloseTimer();
}
};
| < | | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 |
if(e.relatedTarget && e.relatedTarget != tooltipObj){
tooltipInfo.ixHover = -1;
hideGraphTooltip();
stopDwellTimer();
stopCloseTimer();
}
};
function mouseOverNode(e){ /* Invoked by mousemove events over a graph node */
e.stopPropagation()
if(tooltipInfo.ixHover==-2) return
tooltipInfo.ixHover = -2
tooltipInfo.posX = e.clientX
tooltipInfo.posY = e.clientY
tooltipInfo.nodeHover = this
stopCloseTimer();
|
| ︙ | ︙ | |||
397 398 399 400 401 402 403 |
var cls = node.cls;
if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
if( p.f&1 ) cls += " leaf";
var n = drawBox(cls,p.bg,p.x,p.y);
n.id = "tln"+p.id;
n.onclick = clickOnNode;
n.ondblclick = dblclickOnNode;
| | | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 |
var cls = node.cls;
if( p.hasOwnProperty('mi') && p.mi.length ) cls += " merge";
if( p.f&1 ) cls += " leaf";
var n = drawBox(cls,p.bg,p.x,p.y);
n.id = "tln"+p.id;
n.onclick = clickOnNode;
n.ondblclick = dblclickOnNode;
n.onmousemove = mouseOverNode;
n.style.zIndex = 10;
if( !tx.omitDescenders ){
if( p.u==0 ){
if( p.hasOwnProperty('mo') && p.r==p.mo ){
var ix = p.hasOwnProperty('cu') ? p.cu : p.mu;
var top = tx.rowinfo[ix-tx.iTopRow]
drawUpArrow(p,{x: p.x, y: top.y-node.h}, p.fg, p.id);
|
| ︙ | ︙ |
Changes to src/mkbuiltin.c.
| ︙ | ︙ | |||
67 68 69 70 71 72 73 74 |
static void compressJavascript(unsigned char *z, int *pn){
int n = *pn;
int i, j, k;
for(i=j=0; i<n; i++){
unsigned char c = z[i];
if( c=='/' ){
if( z[i+1]=='*' ){
for(k=i+3; k<n && (z[k]!='/' || z[k-1]!='*'); k++){}
| > < | < | < > | < | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 |
static void compressJavascript(unsigned char *z, int *pn){
int n = *pn;
int i, j, k;
for(i=j=0; i<n; i++){
unsigned char c = z[i];
if( c=='/' ){
if( z[i+1]=='*' ){
while( j>0 && (z[j-1]==' ' || z[j-1]=='\t') ){ j--; }
for(k=i+3; k<n && (z[k]!='/' || z[k-1]!='*'); k++){}
i = k;
continue;
}else if( z[i+1]=='/' ){
while( j>0 && (z[j-1]==' ' || z[j-1]=='\t') ){ j--; }
for(k=i+2; k<n && z[k]!='\n'; k++){}
i = k-1;
continue;
}
}
if( c=='\n' ){
while( j>0 && isspace(z[j-1]) ) j--;
z[j++] = '\n';
while( i+1<n && isspace(z[i+1]) ) i++;
|
| ︙ | ︙ | |||
160 161 162 163 164 165 166 |
while( pData[nSkip]=='#' ){
while( pData[nSkip]!=0 && pData[nSkip]!='\n' ){ nSkip++; }
if( pData[nSkip]=='\n' ) nSkip++;
}
/* Compress javascript source files */
nName = (int)strlen(aRes[i].zName);
| | > > | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 |
while( pData[nSkip]=='#' ){
while( pData[nSkip]!=0 && pData[nSkip]!='\n' ){ nSkip++; }
if( pData[nSkip]=='\n' ) nSkip++;
}
/* Compress javascript source files */
nName = (int)strlen(aRes[i].zName);
if( (nName>3 && strcmp(&aRes[i].zName[nName-3],".js")==0)
|| (nName>7 && strcmp(&aRes[i].zName[nName-7], "/js.txt")==0)
){
int x = sz-nSkip;
compressJavascript(pData+nSkip, &x);
sz = x + nSkip;
}
aRes[i].nByte = sz - nSkip;
aRes[i].idx = i;
|
| ︙ | ︙ |