Fossil

Check-in [da8a0f82b5]
Login

Check-in [da8a0f82b5]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Implemented fetching and injection of chunks which are smaller than the configured load size, but the results do not play well with our scrolling workaround and need to be revisited after some sleep, perhaps appending/prepending the results directly to the previous/next TR instead of injecting a new one.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | diff-js-refactoring
Files: files | file ages | folders
SHA3-256: da8a0f82b5d5638a39bb72206a2a9c6ccaadc4b8ef392297cefaafb72847caea
User & Date: stephan 2021-09-09 21:36:19.284
Context
2021-09-09
22:41
When filling a whole gap with loaded jchunk lines, merge the previous and following TR elements together with the new content, providing a seamless fill, eliminating the extraneous scrollbars. This means we cannot style the newly-loaded chunk differently (like github does), but it looks much, much nicer than before. Partial-chunk loads are still pending. ... (check-in: 11a981ead0 user: stephan tags: diff-js-refactoring)
21:36
Implemented fetching and injection of chunks which are smaller than the configured load size, but the results do not play well with our scrolling workaround and need to be revisited after some sleep, perhaps appending/prepending the results directly to the previous/next TR instead of injecting a new one. ... (check-in: da8a0f82b5 user: stephan tags: diff-js-refactoring)
20:03
Style improvements. Hooked up the buttons but they don't yet fetch anything. ... (check-in: f0984389ba user: stephan tags: diff-js-refactoring)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/default.css.
542
543
544
545
546
547
548



549
550
551
552
553
554
555
  padding: 0 0.25em 0 0.5em;
}
table.diff td {
  vertical-align: top;
}
table.diff pre {
  margin: 0 0 0 0;



}
tr.diffskip.jchunk {
  /* jchunk gets added from JS to diffskip rows when they are
     plugged into the /jchunk route and removed after that data
     is fetched. */
  background-color: aliceblue;
  padding: 0;







>
>
>







542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
  padding: 0 0.25em 0 0.5em;
}
table.diff td {
  vertical-align: top;
}
table.diff pre {
  margin: 0 0 0 0;
}
table.diff tr.fetched {
  opacity: 0.7;
}
tr.diffskip.jchunk {
  /* jchunk gets added from JS to diffskip rows when they are
     plugged into the /jchunk route and removed after that data
     is fetched. */
  background-color: aliceblue;
  padding: 0;
Changes to src/fossil.diff.js.
215
216
217
218
219
220
221
222

223

224
225

226
227
228
229
230
231
232
     https://github.com/msteveb/autosetup/commit/235925e914a52a542

     Each instance corresponds to a single TR.diffskip element.
  */
  Diff.ChunkLoadControls = function(isSplit, tr){
    this.isSplit = isSplit;
    this.e = {/*DOM elements*/
      tr: tr

    };

    tr.$chunker = this /* keep GC from reaping this */;
    this.pos = {

      /* These line numbers correspond to the LHS file. Because the
         contents are common to both sides, we have the same number
         for the RHS, but need to extract those line numbers from the
         neighboring TR blocks */
      startLhs: +tr.dataset.startln,
      endLhs: +tr.dataset.endln
    };







|
>

>


>







215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
     https://github.com/msteveb/autosetup/commit/235925e914a52a542

     Each instance corresponds to a single TR.diffskip element.
  */
  Diff.ChunkLoadControls = function(isSplit, tr){
    this.isSplit = isSplit;
    this.e = {/*DOM elements*/
      tr: tr,
      table: tr.parentElement/*TBODY*/.parentElement
    };
    this.fileHash = this.e.table.dataset.lefthash;
    tr.$chunker = this /* keep GC from reaping this */;
    this.pos = {
      //hash: F.hashDigits(this.fileHash),
      /* These line numbers correspond to the LHS file. Because the
         contents are common to both sides, we have the same number
         for the RHS, but need to extract those line numbers from the
         neighboring TR blocks */
      startLhs: +tr.dataset.startln,
      endLhs: +tr.dataset.endln
    };
258
259
260
261
262
263
264






265
266
267
268
269

270
271
272
273
274
275
276
    if(tr.previousElementSibling){
      this.pos.prev = {
        endLhs: extractLineNo(true, false, tr.previousElementSibling, isSplit),
        endRhs: extractLineNo(false, false, tr.previousElementSibling, isSplit)
      };
    }
    let btnUp = false, btnDown = false;






    if(this.pos.prev && this.pos.next
       && ((this.pos.next.startLhs - this.pos.prev.endLhs)
           <= Diff.config.chunkLoadLines)){
      /* Place a single button to load the whole block, rather
         than separate up/down buttons. */

      btnDown = false;
      btnUp = D.append(
        D.addClass(D.span(), 'button', 'up', 'down'),
        D.span(/*glyph holder*/)
        //D.append(D.span(), this.config.glyphDown, this.config.glyphUp)
      );
    }else{







>
>
>
>
>
>
|
|
|


>







261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
    if(tr.previousElementSibling){
      this.pos.prev = {
        endLhs: extractLineNo(true, false, tr.previousElementSibling, isSplit),
        endRhs: extractLineNo(false, false, tr.previousElementSibling, isSplit)
      };
    }
    let btnUp = false, btnDown = false;
    /**
       this.pos.next refers to the line numbers in the next TR's chunk.
       this.pos.prev refers to the line numbers in the previous TR's chunk.
    */
    if((this.pos.startLhs + Diff.config.chunkLoadLines
        >= this.pos.endLhs )
       || (this.pos.prev && this.pos.next
           && ((this.pos.next.startLhs - this.pos.prev.endLhs)
               <= Diff.config.chunkLoadLines))){
      /* Place a single button to load the whole block, rather
         than separate up/down buttons. */
      //delete this.pos.next;
      btnDown = false;
      btnUp = D.append(
        D.addClass(D.span(), 'button', 'up', 'down'),
        D.span(/*glyph holder*/)
        //D.append(D.span(), this.config.glyphDown, this.config.glyphUp)
      );
    }else{
317
318
319
320
321
322
323
324
325


326
327
328
329
330
331
332



333
334
335




336
337

338
339
340

341
342
343
344
345

346
347






































348




349
350
351
352
353
354


355

356
357
358
359
360
361
362
363









364









365
366
367
368
369
370
371
      if(this.e.posState){
        D.append(D.clearElement(this.e.posState), JSON.stringify(this.pos));
      }
      return this;
    },
    
    destroy: function(){
      delete this.tr.$chunker;
      D.remove(this.e.tr);


      delete this.e;
      delete this.pos;
    },
    /**
       Creates and returns a new TR element, including its TD elements (depending
       on this.isSplit), but does not fill it with any information nor inject it
       into the table (it doesn't know where to do so).



    */
    newTR: function(){
      const tr = D.tr();




      if(this.isSplit){
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnl' ), D.pre());

        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtl' ), D.pre());
        D.addClass( D.td(tr), 'diffsep' );
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnr' ), D.pre());

        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtr' ), D.pre());
      }else{
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnl' ), D.pre());
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnr' ), D.pre());
        D.addClass( D.td(tr), 'diffsep' );

        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtu' ), D.pre());
      }






































      return tr;




    },

    fetchChunk: function(direction/*-1=prev, 1=next, 0=both*/){
      /* Forewarning, this is a bit confusing: when fetching the
         previous lines, we're doing so on behalf of the *next* diff
         chunk (this.pos.next), and vice versa. */


      if(this.isFetching) return this;

      if(direction<0/*prev chunk*/ && !this.pos.next){
        console.error("Attempt to fetch previous diff lines but don't have any.");
        return this;
      }else if(direction>0/*next chunk*/ && !this.pos.prev){
        console.error("Attempt to fetch next diff lines but don't have any.");
        return this;
      }
      console.debug("Going to fetch in direction",direction);









      this.updatePosDebug();









      return this;
    }
  };

  Diff.addDiffSkipHandlers = function(){
    const tables = document.querySelectorAll('table.diff[data-lefthash]:not(.diffskipped)');
    /* Potential performance-related TODO: instead of installing all







<

>
>




|
|
|
>
>
>


|
>
>
>
>

|
>
|

|
>
|

|
|

>
|

>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
>
>
>
>






>
>
|
>








>
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>







327
328
329
330
331
332
333

334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
      if(this.e.posState){
        D.append(D.clearElement(this.e.posState), JSON.stringify(this.pos));
      }
      return this;
    },
    
    destroy: function(){

      D.remove(this.e.tr);
      delete this.e.tr.$chunker;
      delete this.e.tr;
      delete this.e;
      delete this.pos;
    },
    /**
       Creates a new TR element, including its TD elements (depending
       on this.isSplit), but does not fill it with any information nor
       inject it into the table (it doesn't know where to do
       so). Returns an object containing the TR element and various TD
       elements which will likely be needed by the routine which
       called this. See this code for details.
    */
    newTR: function(){
      const tr = D.addClass(D.tr(),'fetched'), rc = {
        tr,
        preLnL: D.pre(),
        preLnR: D.pre()
      };
      if(this.isSplit){
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnl' ), rc.preLnL);
        rc.preTxtL = D.pre();
        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtl' ), rc.preTxtL);
        D.addClass( D.td(tr), 'diffsep' );
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnr' ), rc.preLnR);
        rc.preTxtR = D.pre();
        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtr' ), rc.preTxtR);
      }else{
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnl' ), rc.preLnL);
        D.append(D.addClass( D.td(tr), 'diffln', 'difflnr' ), rc.preLnR);
        D.addClass( D.td(tr), 'diffsep' );
        rc.preTxtU = D.pre();
        D.append(D.addClass( D.td(tr), 'difftxt', 'difftxtu' ), rc.preTxtU);
      }
      return rc;
    },

    injectResponse: function(direction/*as for fetchChunk()*/,
                             urlParam/*from fetchChunk()*/,
                             lines/*response lines*/){
      console.debug("Loading line range ",urlParam.from,"-",urlParam.to);
      const row = this.newTR();
      const lineno = [];
      let i;
      for( i = urlParam.from; i <= urlParam.to; ++i ){
        /* TODO: space-pad numbers, but we don't know the proper length from here. */
        lineno.push(i);
      }
      row.preLnL.innerText = lineno.join('\n')+'\n';
      if(row.preTxtU){//unified diff
        row.preTxtU.innerText = lines.join('\n')+'\n';
      }else{//split diff
        const code = lines.join('\n')+'\n';
        row.preTxtL.innerText = code;
        row.preTxtR.innerText = code;
      }
      if(0===direction){
        /* Closing the whole gap between two chunks or a whole gap
           at the start or end of a diff. */
        let startLnR = this.pos.prev
            ? this.pos.prev.endRhs+1 /* Closing the whole gap between two chunks
                                        or end-of-file gap. */
            : this.pos.next.startRhs - lines.length /* start-of-file gap */;
        lineno.length = 0;
        for( i = startLnR; i < startLnR + lines.length; ++i ){
          /* TODO? space-pad numbers, but we don't know the proper length from here. */
          lineno.push(i);
        }
        row.preLnR.innerText = lineno.join('\n')+'\n';
        this.e.tr.parentNode.insertBefore(row.tr, this.e.tr);
        Diff.initTableDiff(this.e.table/*fix scrolling*/).checkTableWidth(true);
        this.destroy();
        return this;
      }else{
        console.debug("TODO: handle load of partial next/prev");
        this.updatePosDebug();
      }
    },

    fetchChunk: function(direction/*-1=prev, 1=next, 0=both*/){
      /* Forewarning, this is a bit confusing: when fetching the
         previous lines, we're doing so on behalf of the *next* diff
         chunk (this.pos.next), and vice versa. */
      if(this.$isFetching){
        console.debug("Cannot load chunk while a load is pending.");
        return this;
      }
      if(direction<0/*prev chunk*/ && !this.pos.next){
        console.error("Attempt to fetch previous diff lines but don't have any.");
        return this;
      }else if(direction>0/*next chunk*/ && !this.pos.prev){
        console.error("Attempt to fetch next diff lines but don't have any.");
        return this;
      }
      console.debug("Going to fetch in direction",direction);
      const fOpt = {
        urlParams:{
          name: this.fileHash, from: 0, to: 0
        },
        aftersend: ()=>delete this.$isFetching
      };
      const self = this;
      if(direction!=0){
        console.debug("Skipping fetch for now.");
        return this;
      }else{
        fOpt.urlParams.from = this.pos.startLhs;
        fOpt.urlParams.to = this.pos.endLhs;
        fOpt.onload = function(list){
          self.injectResponse(direction,fOpt.urlParams,list);
        };
      }
      this.$isFetching = true;
      Diff.fetchArtifactChunk(fOpt);
      return this;
    }
  };

  Diff.addDiffSkipHandlers = function(){
    const tables = document.querySelectorAll('table.diff[data-lefthash]:not(.diffskipped)');
    /* Potential performance-related TODO: instead of installing all