Fossil SCM

Rotated the paperclip 45 degrees (it's now horizontal) and restored the behavior that ctrl-enter will send a message if there is only an attachment with no text.

stephan 2021-10-03 19:56 chat-input-rework

Commit b8a20e20ff35f8879a1b3737771eed164647d269e55e0f82016e4838d55015b1

Parent c6cc5557c0f4ea6…

2 files changed +12 -11 +2 -2

~ src/chat.c ~ src/fossil.page.chat.js

M src/chat.c

+12 -11

		--- src/chat.c
		+++ src/chat.c
		@@ -144,21 +144,22 @@
144	144	void chat_webpage(void){
145	145	char *zAlert;
146	146	char *zProjectName;
147	147	char * zInputPlaceholder0; /* Common text input placeholder value */
148	148	const char *zPaperclip =
149		- "<svg height=\"12.28288\" width=\"13.990313\"><path d=\"M "
150		- "12.266368,0.65287795 A 4.1,4.1 0 0 0 7.0963684,1.2528779 "
151		- "l -6.24999999,6.25 a 2.79,2.79 0 0 0 -0.84,2.19 2.84,2.84 "
152		- "0 0 0 1.13999999,2.0600001 2.73,2.73 0 0 0 1.62,0.53 3.13,"
153		- "3.13 0 0 0 2.18,-0.92 L 10.346368,5.9628779 a 1.66,1.66 0 "
154		- "0 0 -2.3399996,-2.35 l -3.6,3.6 0.71,0.71 3.59,-3.6 a 0.66,"
155		- "0.66 0 0 1 0.93,0.93 l -5.39,5.4000001 a 2,2 0 0 1 -2.5,0.3 "
156		- "1.83,1.83 0 0 1 -0.2,-2.7400001 l 6.25,-6.25 a 3.11,3.11 0 "
157		- "0 1 3.8999996,-0.48 3,3 0 0 1 1.31,2.19 3,3 0 0 1 -0.86,2.37 "
158		- "l -5.2799996,5.2600001 0.7,0.71 5.2699996,-5.2600001 a 4,4 0 "
159		- "0 0 -0.57,-6.09999995 z\" /></svg>";
	149	+ "<svg height=\"7.9485579\" width=\"15.807422\"><path d=\"M "
	150	+ "15.74273,3.2321262 A 4.1,4.1 0 0 0 11.662725,6.483619e-4 "
	151	+ "H 2.8238895 A 2.79,2.79 0 0 0 0.68135588,0.95524256 2.84,2.84 "
	152	+ "0 0 0 0.03081756,3.2179844 2.73,2.73 0 0 0 0.80156396,4.7382639 "
	153	+ "3.13,3.13 0 0 0 2.993595,5.6292185 l 7.636753,-4e-7 a 1.66,1.66 "
	154	+ "0 0 0 0.0071,-3.3163305 H 5.5462506 v 1.0040916 l "
	155	+ "5.0840974,-0.00707 a 0.66,0.66 0 0 1 0,1.3152186 l "
	156	+ "-7.6296819,0.00707 A 2,2 0 0 1 1.0207671,3.076563 1.83,1.83 0 0 "
	157	+ "1 2.8168184,0.99766896 h 8.8388356 a 3.11,3.11 0 0 1 "
	158	+ "3.097127,2.41830494 3,3 0 0 1 -0.622254,2.4748737 3,3 0 0 1 "
	159	+ "-2.283955,1.0677313 l -7.4529056,-0.014142 -0.00707,0.9970211 "
	160	+ "7.4458346,0.0071 a 4,4 0 0 0 3.9103,-4.716402 z\" /></svg>";
160	161
161	162	login_check_credentials();
162	163	if( !g.perm.Chat ){
163	164	login_needed(g.anon.Chat);
164	165	return;
165	166

	--- src/chat.c
	+++ src/chat.c
	@@ -144,21 +144,22 @@
144	void chat_webpage(void){
145	char *zAlert;
146	char *zProjectName;
147	char * zInputPlaceholder0; /* Common text input placeholder value */
148	const char *zPaperclip =
149	"<svg height=\"12.28288\" width=\"13.990313\"><path d=\"M "
150	"12.266368,0.65287795 A 4.1,4.1 0 0 0 7.0963684,1.2528779 "
151	"l -6.24999999,6.25 a 2.79,2.79 0 0 0 -0.84,2.19 2.84,2.84 "
152	"0 0 0 1.13999999,2.0600001 2.73,2.73 0 0 0 1.62,0.53 3.13,"
153	"3.13 0 0 0 2.18,-0.92 L 10.346368,5.9628779 a 1.66,1.66 0 "
154	"0 0 -2.3399996,-2.35 l -3.6,3.6 0.71,0.71 3.59,-3.6 a 0.66,"
155	"0.66 0 0 1 0.93,0.93 l -5.39,5.4000001 a 2,2 0 0 1 -2.5,0.3 "
156	"1.83,1.83 0 0 1 -0.2,-2.7400001 l 6.25,-6.25 a 3.11,3.11 0 "
157	"0 1 3.8999996,-0.48 3,3 0 0 1 1.31,2.19 3,3 0 0 1 -0.86,2.37 "
158	"l -5.2799996,5.2600001 0.7,0.71 5.2699996,-5.2600001 a 4,4 0 "
159	"0 0 -0.57,-6.09999995 z\" /></svg>";

160
161	login_check_credentials();
162	if( !g.perm.Chat ){
163	login_needed(g.anon.Chat);
164	return;
165

	--- src/chat.c
	+++ src/chat.c
	@@ -144,21 +144,22 @@
144	void chat_webpage(void){
145	char *zAlert;
146	char *zProjectName;
147	char * zInputPlaceholder0; /* Common text input placeholder value */
148	const char *zPaperclip =
149	"<svg height=\"7.9485579\" width=\"15.807422\"><path d=\"M "
150	"15.74273,3.2321262 A 4.1,4.1 0 0 0 11.662725,6.483619e-4 "
151	"H 2.8238895 A 2.79,2.79 0 0 0 0.68135588,0.95524256 2.84,2.84 "
152	"0 0 0 0.03081756,3.2179844 2.73,2.73 0 0 0 0.80156396,4.7382639 "
153	"3.13,3.13 0 0 0 2.993595,5.6292185 l 7.636753,-4e-7 a 1.66,1.66 "
154	"0 0 0 0.0071,-3.3163305 H 5.5462506 v 1.0040916 l "
155	"5.0840974,-0.00707 a 0.66,0.66 0 0 1 0,1.3152186 l "
156	"-7.6296819,0.00707 A 2,2 0 0 1 1.0207671,3.076563 1.83,1.83 0 0 "
157	"1 2.8168184,0.99766896 h 8.8388356 a 3.11,3.11 0 0 1 "
158	"3.097127,2.41830494 3,3 0 0 1 -0.622254,2.4748737 3,3 0 0 1 "
159	"-2.283955,1.0677313 l -7.4529056,-0.014142 -0.00707,0.9970211 "
160	"7.4458346,0.0071 a 4,4 0 0 0 3.9103,-4.716402 z\" /></svg>";
161
162	login_check_credentials();
163	if( !g.perm.Chat ){
164	login_needed(g.anon.Chat);
165	return;
166

M src/fossil.page.chat.js

+2 -2

		--- src/fossil.page.chat.js
		+++ src/fossil.page.chat.js
		@@ -1251,12 +1251,12 @@
1251	1251	}else{
1252	1252	Chat.e.btnPreview.click();
1253	1253	}
1254	1254	return false;
1255	1255	}
1256		- if(ev.ctrlKey && !text){
1257		- /* Ctrl-enter on an empty field toggles Enter/Ctrl-enter mode */
	1256	+ if(ev.ctrlKey && !text && !BlobXferState.blob){
	1257	+ /* Ctrl-enter on empty input field(s) toggles Enter/Ctrl-enter mode */
1258	1258	ev.preventDefault();
1259	1259	ev.stopPropagation();
1260	1260	f.$toggleCtrl(ctrlMode);
1261	1261	return false;
1262	1262	}
1263	1263

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -1251,12 +1251,12 @@
1251	}else{
1252	Chat.e.btnPreview.click();
1253	}
1254	return false;
1255	}
1256	if(ev.ctrlKey && !text){
1257	/* Ctrl-enter on an empty field toggles Enter/Ctrl-enter mode */
1258	ev.preventDefault();
1259	ev.stopPropagation();
1260	f.$toggleCtrl(ctrlMode);
1261	return false;
1262	}
1263

	--- src/fossil.page.chat.js
	+++ src/fossil.page.chat.js
	@@ -1251,12 +1251,12 @@
1251	}else{
1252	Chat.e.btnPreview.click();
1253	}
1254	return false;
1255	}
1256	if(ev.ctrlKey && !text && !BlobXferState.blob){
1257	/* Ctrl-enter on empty input field(s) toggles Enter/Ctrl-enter mode */
1258	ev.preventDefault();
1259	ev.stopPropagation();
1260	f.$toggleCtrl(ctrlMode);
1261	return false;
1262	}
1263

Fossil SCM

Keyboard Shortcuts