Fossil SCM

Modernized sbsdiff.js a tiny bit, adapted it to optionally be callable multiple times via fossil.page.tweakSbsDiffs(), and activate that when fileedit's sbs diff is refreshed.

stephan 2020-05-15 04:40 fileedit-ajaxify

Commit dd46579617c5c46db856e49aca14cfe3f67d6e3fb442bc45304013ae743b0a62

Parent 39a5241b6f7e103…

3 files changed +1 +1 +8 -5

~ src/fileedit.c ~ src/fossil.page.fileedit.js ~ src/sbsdiff.js

M src/fileedit.c

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -2106,10 +2106,11 @@
2106	2106	}
2107	2107
2108	2108	blob_reset(&err);
2109	2109	CheckinMiniInfo_cleanup(&cimi);
2110	2110	style_emit_script_fossil_bootstrap(0);
	2111	+ append_diff_javascript(1);
2111	2112	style_emit_script_fetch(0);
2112	2113	style_emit_script_tabs(0)/also emits fossil.dom/;
2113	2114	style_emit_script_confirmer(0);
2114	2115	style_emit_script_builtin(0, "fossil.page.fileedit.js");
2115	2116	if(blob_size(&endScript)>0){
2116	2117

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -2106,10 +2106,11 @@
2106	}
2107
2108	blob_reset(&err);
2109	CheckinMiniInfo_cleanup(&cimi);
2110	style_emit_script_fossil_bootstrap(0);

2111	style_emit_script_fetch(0);
2112	style_emit_script_tabs(0)/also emits fossil.dom/;
2113	style_emit_script_confirmer(0);
2114	style_emit_script_builtin(0, "fossil.page.fileedit.js");
2115	if(blob_size(&endScript)>0){
2116

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -2106,10 +2106,11 @@
2106	}
2107
2108	blob_reset(&err);
2109	CheckinMiniInfo_cleanup(&cimi);
2110	style_emit_script_fossil_bootstrap(0);
2111	append_diff_javascript(1);
2112	style_emit_script_fetch(0);
2113	style_emit_script_tabs(0)/also emits fossil.dom/;
2114	style_emit_script_confirmer(0);
2115	style_emit_script_builtin(0, "fossil.page.fileedit.js");
2116	if(blob_size(&endScript)>0){
2117

M src/fossil.page.fileedit.js

		--- src/fossil.page.fileedit.js
		+++ src/fossil.page.fileedit.js
		@@ -683,10 +683,11 @@
683	683	"<div>Diff <code>[",
684	684	self.finfo.checkin,
685	685	"]</code> → Local Edits</div>",
686	686	c\|\|'No changes.'
687	687	].join('');
	688	+ if(sbs) P.tweakSbsDiffs();
688	689	F.message('Updated diff.');
689	690	self.tabs.switchToTab(self.e.tabs.diff);
690	691	}
691	692	});
692	693	return this;
693	694

	--- src/fossil.page.fileedit.js
	+++ src/fossil.page.fileedit.js
	@@ -683,10 +683,11 @@
683	"<div>Diff <code>[",
684	self.finfo.checkin,
685	"]</code> → Local Edits</div>",
686	c\|\|'No changes.'
687	].join('');

688	F.message('Updated diff.');
689	self.tabs.switchToTab(self.e.tabs.diff);
690	}
691	});
692	return this;
693

	--- src/fossil.page.fileedit.js
	+++ src/fossil.page.fileedit.js
	@@ -683,10 +683,11 @@
683	"<div>Diff <code>[",
684	self.finfo.checkin,
685	"]</code> → Local Edits</div>",
686	c\|\|'No changes.'
687	].join('');
688	if(sbs) P.tweakSbsDiffs();
689	F.message('Updated diff.');
690	self.tabs.switchToTab(self.e.tabs.diff);
691	}
692	});
693	return this;
694

M src/sbsdiff.js

+8 -5

		--- src/sbsdiff.js
		+++ src/sbsdiff.js
		@@ -6,11 +6,12 @@
6	6	var SCROLL_LEN = 25;
7	7	function initSbsDiff(diff){
8	8	var txtCols = diff.querySelectorAll('.difftxtcol');
9	9	var txtPres = diff.querySelectorAll('.difftxtcol pre');
10	10	var width = Math.max(txtPres[0].scrollWidth, txtPres[1].scrollWidth);
11		- for(var i=0; i<2; i++){
	11	+ var i;
	12	+ for(i=0; i<2; i++){
12	13	txtPres[i].style.width = width + 'px';
13	14	txtCols[i].onscroll = function(e){
14	15	txtCols[0].scrollLeft = txtCols[1].scrollLeft = this.scrollLeft;
15	16	};
16	17	}
		@@ -21,10 +22,12 @@
21	22	if( !len ) return;
22	23	txtCols[0].scrollLeft += len;
23	24	return false;
24	25	};
25	26	}
26		- var diffs = document.querySelectorAll('.sbsdiffcols');
27		- for(var i=0; i<diffs.length; i++){
28		- initSbsDiff(diffs[i]);
	27	+ document.querySelectorAll('.sbsdiffcols').forEach(initSbsDiff);
	28	+ if(window.fossil && fossil.page){
	29	+ fossil.page.tweakSbsDiffs = function(){
	30	+ document.querySelectorAll('.sbsdiffcols').forEach(initSbsDiff);
	31	+ };
29	32	}
30		-}())
	33	+})();
31	34

	--- src/sbsdiff.js
	+++ src/sbsdiff.js
	@@ -6,11 +6,12 @@
6	var SCROLL_LEN = 25;
7	function initSbsDiff(diff){
8	var txtCols = diff.querySelectorAll('.difftxtcol');
9	var txtPres = diff.querySelectorAll('.difftxtcol pre');
10	var width = Math.max(txtPres[0].scrollWidth, txtPres[1].scrollWidth);
11	for(var i=0; i<2; i++){

12	txtPres[i].style.width = width + 'px';
13	txtCols[i].onscroll = function(e){
14	txtCols[0].scrollLeft = txtCols[1].scrollLeft = this.scrollLeft;
15	};
16	}
	@@ -21,10 +22,12 @@
21	if( !len ) return;
22	txtCols[0].scrollLeft += len;
23	return false;
24	};
25	}
26	var diffs = document.querySelectorAll('.sbsdiffcols');
27	for(var i=0; i<diffs.length; i++){
28	initSbsDiff(diffs[i]);


29	}
30	}())
31

	--- src/sbsdiff.js
	+++ src/sbsdiff.js
	@@ -6,11 +6,12 @@
6	var SCROLL_LEN = 25;
7	function initSbsDiff(diff){
8	var txtCols = diff.querySelectorAll('.difftxtcol');
9	var txtPres = diff.querySelectorAll('.difftxtcol pre');
10	var width = Math.max(txtPres[0].scrollWidth, txtPres[1].scrollWidth);
11	var i;
12	for(i=0; i<2; i++){
13	txtPres[i].style.width = width + 'px';
14	txtCols[i].onscroll = function(e){
15	txtCols[0].scrollLeft = txtCols[1].scrollLeft = this.scrollLeft;
16	};
17	}
	@@ -21,10 +22,12 @@
22	if( !len ) return;
23	txtCols[0].scrollLeft += len;
24	return false;
25	};
26	}
27	document.querySelectorAll('.sbsdiffcols').forEach(initSbsDiff);
28	if(window.fossil && fossil.page){
29	fossil.page.tweakSbsDiffs = function(){
30	document.querySelectorAll('.sbsdiffcols').forEach(initSbsDiff);
31	};
32	}
33	})();
34

Fossil SCM

Keyboard Shortcuts