Fossil SCM

Swapped the style_emit_script_builtin() parameters for consistency with style_emit_script_tag().

stephan 2020-05-08 14:15 fileedit-ajaxify

Commit 02240eec90dee97f62aed94b6365d5878240c436d8a07a56ada9246e40efbb69

Parent 07d0bcc598fdbbf…

2 files changed +1 -1 +6 -6

M src/fileedit.c

+1 -1

		--- src/fileedit.c
		+++ src/fileedit.c
		@@ -1829,11 +1829,11 @@
1829	1829	blob_reset(&err);
1830	1830	CheckinMiniInfo_cleanup(&cimi);
1831	1831	style_emit_script_fossil_bootstrap(0);
1832	1832	style_emit_script_fetch(0);
1833	1833	style_emit_script_tabs(0);
1834		- style_emit_script_builtin("fossil.page.fileedit.js",0);
	1834	+ style_emit_script_builtin(0, "fossil.page.fileedit.js");
1835	1835	style_emit_script_confirmer(0);
1836	1836	if(blob_size(&endScript)>0){
1837	1837	style_emit_script_tag(0,0);
1838	1838	CX("(function(){\n");
1839	1839	CX("try{\n%b\n}"
1840	1840

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -1829,11 +1829,11 @@
1829	blob_reset(&err);
1830	CheckinMiniInfo_cleanup(&cimi);
1831	style_emit_script_fossil_bootstrap(0);
1832	style_emit_script_fetch(0);
1833	style_emit_script_tabs(0);
1834	style_emit_script_builtin("fossil.page.fileedit.js",0);
1835	style_emit_script_confirmer(0);
1836	if(blob_size(&endScript)>0){
1837	style_emit_script_tag(0,0);
1838	CX("(function(){\n");
1839	CX("try{\n%b\n}"
1840

	--- src/fileedit.c
	+++ src/fileedit.c
	@@ -1829,11 +1829,11 @@
1829	blob_reset(&err);
1830	CheckinMiniInfo_cleanup(&cimi);
1831	style_emit_script_fossil_bootstrap(0);
1832	style_emit_script_fetch(0);
1833	style_emit_script_tabs(0);
1834	style_emit_script_builtin(0, "fossil.page.fileedit.js");
1835	style_emit_script_confirmer(0);
1836	if(blob_size(&endScript)>0){
1837	style_emit_script_tag(0,0);
1838	CX("(function(){\n");
1839	CX("try{\n%b\n}"
1840

M src/style.c

+6 -6

		--- src/style.c
		+++ src/style.c
		@@ -1470,11 +1470,11 @@
1470	1470	if(asInline){
1471	1471	CX("%s\n", builtin_text("fossil.bootstrap.js"));
1472	1472	}
1473	1473	style_emit_script_tag(1,0);
1474	1474	if(asInline==0){
1475		- style_emit_script_builtin("fossil.bootstrap.js", 0);
	1475	+ style_emit_script_builtin(0, "fossil.bootstrap.js");
1476	1476	}
1477	1477	}
1478	1478	}
1479	1479
1480	1480	/*
		@@ -1516,11 +1516,11 @@
1516	1516	**
1517	1517	** If it is false, a script tag loading it via
1518	1518	** src=builtin/{{zName}}?cache=XYZ is emitted, where XYZ is a prefix
1519	1519	** of the builtin content's md5 hash.
1520	1520	*/
1521		-void style_emit_script_builtin(char const * zName, int asInline){
	1521	+void style_emit_script_builtin(int asInline, char const * zName){
1522	1522	if(asInline){
1523	1523	style_emit_script_tag(0,0);
1524	1524	CX("%s", builtin_text(zName));
1525	1525	style_emit_script_tag(1,0);
1526	1526	}else{
		@@ -1551,11 +1551,11 @@
1551	1551	** routine.
1552	1552	*/
1553	1553	void style_emit_script_fetch(int asInline){
1554	1554	static int once = 0;
1555	1555	if(0==once++){
1556		- style_emit_script_builtin("fossil.fetch.js", asInline);
	1556	+ style_emit_script_builtin(asInline, "fossil.fetch.js");
1557	1557	}
1558	1558	}
1559	1559
1560	1560	/*
1561	1561	** The first time this is called it emits the JS code from the
		@@ -1570,11 +1570,11 @@
1570	1570	** routine.
1571	1571	*/
1572	1572	void style_emit_script_dom(int asInline){
1573	1573	static int once = 0;
1574	1574	if(0==once++){
1575		- style_emit_script_builtin("fossil.dom.js", asInline);
	1575	+ style_emit_script_builtin(asInline, "fossil.dom.js");
1576	1576	}
1577	1577	}
1578	1578
1579	1579	/*
1580	1580	** The first time this is called, it calls style_emit_script_dom(),
		@@ -1587,11 +1587,11 @@
1587	1587	*/
1588	1588	void style_emit_script_tabs(int asInline){
1589	1589	static int once = 0;
1590	1590	if(0==once++){
1591	1591	style_emit_script_dom(asInline);
1592		- style_emit_script_builtin("fossil.tabs.js",asInline);
	1592	+ style_emit_script_builtin(asInline, "fossil.tabs.js");
1593	1593	}
1594	1594	}
1595	1595
1596	1596	/*
1597	1597	** The first time this is called it emits the JS code from the
		@@ -1602,8 +1602,8 @@
1602	1602	** src=builtin/... to load the script.
1603	1603	*/
1604	1604	void style_emit_script_confirmer(int asInline){
1605	1605	static int once = 0;
1606	1606	if(0==once++){
1607		- style_emit_script_builtin("fossil.confirmer.js",asInline);
	1607	+ style_emit_script_builtin(asInline, "fossil.confirmer.js");
1608	1608	}
1609	1609	}
1610	1610

	--- src/style.c
	+++ src/style.c
	@@ -1470,11 +1470,11 @@
1470	if(asInline){
1471	CX("%s\n", builtin_text("fossil.bootstrap.js"));
1472	}
1473	style_emit_script_tag(1,0);
1474	if(asInline==0){
1475	style_emit_script_builtin("fossil.bootstrap.js", 0);
1476	}
1477	}
1478	}
1479
1480	/*
	@@ -1516,11 +1516,11 @@
1516	**
1517	** If it is false, a script tag loading it via
1518	** src=builtin/{{zName}}?cache=XYZ is emitted, where XYZ is a prefix
1519	** of the builtin content's md5 hash.
1520	*/
1521	void style_emit_script_builtin(char const * zName, int asInline){
1522	if(asInline){
1523	style_emit_script_tag(0,0);
1524	CX("%s", builtin_text(zName));
1525	style_emit_script_tag(1,0);
1526	}else{
	@@ -1551,11 +1551,11 @@
1551	** routine.
1552	*/
1553	void style_emit_script_fetch(int asInline){
1554	static int once = 0;
1555	if(0==once++){
1556	style_emit_script_builtin("fossil.fetch.js", asInline);
1557	}
1558	}
1559
1560	/*
1561	** The first time this is called it emits the JS code from the
	@@ -1570,11 +1570,11 @@
1570	** routine.
1571	*/
1572	void style_emit_script_dom(int asInline){
1573	static int once = 0;
1574	if(0==once++){
1575	style_emit_script_builtin("fossil.dom.js", asInline);
1576	}
1577	}
1578
1579	/*
1580	** The first time this is called, it calls style_emit_script_dom(),
	@@ -1587,11 +1587,11 @@
1587	*/
1588	void style_emit_script_tabs(int asInline){
1589	static int once = 0;
1590	if(0==once++){
1591	style_emit_script_dom(asInline);
1592	style_emit_script_builtin("fossil.tabs.js",asInline);
1593	}
1594	}
1595
1596	/*
1597	** The first time this is called it emits the JS code from the
	@@ -1602,8 +1602,8 @@
1602	** src=builtin/... to load the script.
1603	*/
1604	void style_emit_script_confirmer(int asInline){
1605	static int once = 0;
1606	if(0==once++){
1607	style_emit_script_builtin("fossil.confirmer.js",asInline);
1608	}
1609	}
1610

	--- src/style.c
	+++ src/style.c
	@@ -1470,11 +1470,11 @@
1470	if(asInline){
1471	CX("%s\n", builtin_text("fossil.bootstrap.js"));
1472	}
1473	style_emit_script_tag(1,0);
1474	if(asInline==0){
1475	style_emit_script_builtin(0, "fossil.bootstrap.js");
1476	}
1477	}
1478	}
1479
1480	/*
	@@ -1516,11 +1516,11 @@
1516	**
1517	** If it is false, a script tag loading it via
1518	** src=builtin/{{zName}}?cache=XYZ is emitted, where XYZ is a prefix
1519	** of the builtin content's md5 hash.
1520	*/
1521	void style_emit_script_builtin(int asInline, char const * zName){
1522	if(asInline){
1523	style_emit_script_tag(0,0);
1524	CX("%s", builtin_text(zName));
1525	style_emit_script_tag(1,0);
1526	}else{
	@@ -1551,11 +1551,11 @@
1551	** routine.
1552	*/
1553	void style_emit_script_fetch(int asInline){
1554	static int once = 0;
1555	if(0==once++){
1556	style_emit_script_builtin(asInline, "fossil.fetch.js");
1557	}
1558	}
1559
1560	/*
1561	** The first time this is called it emits the JS code from the
	@@ -1570,11 +1570,11 @@
1570	** routine.
1571	*/
1572	void style_emit_script_dom(int asInline){
1573	static int once = 0;
1574	if(0==once++){
1575	style_emit_script_builtin(asInline, "fossil.dom.js");
1576	}
1577	}
1578
1579	/*
1580	** The first time this is called, it calls style_emit_script_dom(),
	@@ -1587,11 +1587,11 @@
1587	*/
1588	void style_emit_script_tabs(int asInline){
1589	static int once = 0;
1590	if(0==once++){
1591	style_emit_script_dom(asInline);
1592	style_emit_script_builtin(asInline, "fossil.tabs.js");
1593	}
1594	}
1595
1596	/*
1597	** The first time this is called it emits the JS code from the
	@@ -1602,8 +1602,8 @@
1602	** src=builtin/... to load the script.
1603	*/
1604	void style_emit_script_confirmer(int asInline){
1605	static int once = 0;
1606	if(0==once++){
1607	style_emit_script_builtin(asInline, "fossil.confirmer.js");
1608	}
1609	}
1610

Fossil SCM

Keyboard Shortcuts