10814 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Michael Telatynski	6bb88c0548	attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 11:28:48 +01:00
Michael Telatynski	3e956514b3	also prevent merge/skip on rich text pastes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 11:00:45 +01:00
Michael Telatynski	1a9de3fabe	fix undo on pasting plaintext content ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:58:27 +01:00
Michael Telatynski	f5856270cc	undo removal of stripping <p>s as it breaks HTML /mes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:48:54 +01:00
Michael Telatynski	19e5dc5799	do less rewriting for composer quote to prevent breaking pills ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:10:42 +01:00
Michael Telatynski	8bb08b1b75	fix focus on new editorState as it didn't have focus so broke when alt tab ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-18 10:10:11 +01:00
Michael Telatynski	720a728278	workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 16:13:33 +01:00
Michael Telatynski	1b467f6ca8	fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 16:02:37 +01:00
Michael Telatynski	414908611d	prevent exception if there is no text node at anchor ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:48:15 +01:00
Michael Telatynski	688776bc10	allow enter to remove current block if its empty useful for lists ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:29:40 +01:00
Michael Telatynski	8d4cead105	special-case 'inline-code' button because mark is called 'code' ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 13:24:28 +01:00
Michael Telatynski	ff76b6a981	allow user to break out of blockquote/etc by hitting enter twice ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 12:30:22 +01:00
Michael Telatynski	5b79e3bcd5	fix user autocomplete not adding : if at the start ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 11:56:24 +01:00
Michael Telatynski	23b6abf8b7	no point saving history at this point, maybe future supported ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-17 09:27:11 +01:00
Michael Telatynski	cbe5944ff0	preserve selection and history between room changes and refreshes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 22:04:42 +01:00
Michael Telatynski	1c24f1fd5a	fix 2nd typo in one PR :( ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:34:25 +01:00
Michael Telatynski	547e0ed52c	check if has some completions, not if >=0 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:30:04 +01:00
Michael Telatynski	3000099991	add additional checks for hiding autocomplete to prevent text calculation ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 21:27:52 +01:00
Michael Telatynski	bdbc2cbd38	disable spellCheck when the placeholder is shown because "unencrypted" ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 18:32:50 +01:00
Michael Telatynski	c7859fed1a	add heuristic to compare documents to prevent autocomplete flicker ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 18:27:06 +01:00
Michael Telatynski	f78e3be1eb	Merge branch 't3chguy/slate_cont2' of github.com:matrix-org/matrix-react-sdk into t3chguy/slate_cont2	2018-07-16 16:56:57 +01:00
Michael Telatynski	2f1779751b	make the MessageComposerStore stateless for better performance ... and inter-tab composition (by simplifying it. WIN-WIN) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-16 16:56:08 +01:00
Matthew Hodgson	d7ff7cd4ed	stupid thinkotypo	2018-07-16 12:00:15 +01:00
Michael Telatynski	59a14f2c0b	re-hydrate Values which have been serialized into LocalStorage ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-15 20:34:27 +01:00
Michael Telatynski	7405c5eff2	specify alternate history storage key to prevent conflicts with draft ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-12 16:35:42 +01:00
Michael Telatynski	b4bc09c335	null-guard savedState since now we're accessing its props ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 17:13:33 +01:00
Michael Telatynski	3e05bf19c5	hide autocomplete when moving caret to match existing behaviour ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 16:30:45 +01:00
Michael Telatynski	95909de446	fix MessageComposer not marking translatable strings. run gen-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 11:39:55 +01:00
Michael Telatynski	c3aef6e3a0	workaround for tommoor/slate-md-serializer#14 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 10:29:14 +01:00
Michael Telatynski	fd4f9679df	convert md<->rt if the stored editorState was in a different state ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 09:43:39 +01:00
Michael Telatynski	abbb69dc36	fix fn call, fixes usage of SlashCommands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 17:35:13 +01:00
Michael Telatynski	100ecfe7ce	remove trailing spaces to make linter happy (no-trailing-spaces) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:29:52 +01:00
Michael Telatynski	58301e5dd4	navigateHistory only when at edges of document, to prevent Firefox bug ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:28:17 +01:00
Matthew Hodgson	51591a4d62	fix lint	2018-07-09 20:49:31 +01:00
Michael Telatynski	8bcb987f50	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 20:14:37 +01:00
Matthew Hodgson	0d0934add7	unbreak modifier+space (e.g. emoji insert on macOS) ... (cherry picked from commit c490f87) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:58:04 +01:00
Matthew Hodgson	021409aafe	apply review feedback from @lukebarnard1 ... (cherry picked from commit 37d4bce) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:54:57 +01:00
Matthew Hodgson	83f2614919	add guide to slate's data formats and how we convert ... (cherry picked from commit e7e4ee8) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:54:10 +01:00
Matthew Hodgson	8665f10f27	pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 ... (cherry picked from commit 445faca) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:53:47 +01:00
Michael Telatynski	5bd4104c96	modify ComposerHistoryManager ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit d139dd6) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:43:57 +01:00
Michael Telatynski	5b74c615ae	add missing import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 47b6099) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:57 +01:00
Michael Telatynski	43204ea177	fix Control-Backspace after select-all ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0f32ec0) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:10 +01:00
Michael Telatynski	faf17f06c6	remove debugger statement ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b6f7940) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:36 +01:00
Michael Telatynski	483116fb03	add rule to slate-md-serializer: make underlined and removed work for CM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b521efd) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:29 +01:00
Michael Telatynski	372fa29ad3	take edge into consideration when moving focus region on arrow keys ... fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0982617) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:20 +01:00
Michael Telatynski	c6837af398	import-type Change from slate ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 85ed499) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:00 +01:00
Matthew Hodgson	efdc5430d7	merge develop	2018-07-09 17:50:07 +01:00
Bruno Windels	e61317284b	Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar ... move nag bar clear statement to any desktop notif toggle not just 0->1	2018-07-09 11:17:15 +01:00
David Baker	1646c3180c	Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf ... use TruncatedList to prevent rendering hundreds/thousands of DOM nodes	2018-07-09 10:17:05 +01:00
Michael Telatynski	83a7f126f9	Merge pull request #2047 from matrix-org/hs/fix-server-acl-renderer ... Fix stuff	2018-07-06 20:28:07 +01:00