Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

compose_ui: Revert changes for replace_syntax done in 1ca4566eb2. 

This commit reverts the changes for replace_syntax in 1ca4566eb2
and we again use JS replace instead of replace from text-field-edit.

We do this change because replace from text-field-edit leaves the
replaced text selected, which we don't want. This change is
temporary and we can probably use replace method from
text-field-edit once this issue is fixed in upstream.
This commit is contained in:
Sahil Batra 2022-11-17 15:20:09 +05:30 committed by Tim Abbott
parent c3589ad763
commit 5c833f0423
2 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
frontend_tests/node_tests/compose_ui.js
View File

@ -152,23 +152,17 @@ run_test("smart_insert", ({override}) => {
// like emojis and file links.
});
run_test("replace_syntax", ({override}) => {
run_test("replace_syntax", () => {
$("#compose-textarea").val("abcabc");
$("#compose-textarea")[0] = "compose-textarea";
override(text_field_edit, "replace", (elt, old_syntax, new_syntax) => {
assert.equal(elt, "compose-textarea");
assert.equal(old_syntax, "a");
assert.equal(new_syntax(), "A");
});
compose_ui.replace_syntax("a", "A");
assert.equal($("#compose-textarea").val(), "Abcabc");
compose_ui.replace_syntax(/b/g, "B");
assert.equal($("#compose-textarea").val(), "ABcaBc");
override(text_field_edit, "replace", (elt, old_syntax, new_syntax) => {
assert.equal(elt, "compose-textarea");
assert.equal(old_syntax, "Bca");
assert.equal(new_syntax(), "$$\\pi$$");
});
// Verify we correctly handle `$`s in the replacement syntax
compose_ui.replace_syntax("Bca", "$$\\pi$$");
assert.equal($("#compose-textarea").val(), "A$$\\pi$$Bc");
});
run_test("compute_placeholder_text", () => {
@ -259,8 +253,15 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
let textarea_val = "";
let textarea_caret_pos;
$("#compose-textarea").val = function () {
return textarea_val;
$("#compose-textarea").val = function (...args) {
if (args.length === 0) {
return textarea_val;
}
textarea_val = args[0];
textarea_caret_pos = textarea_val.length;
return this;
};
$("#compose-textarea").caret = function (arg) {
@ -288,6 +289,7 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
override(text_field_edit, "insert", (elt, syntax) => {
assert.equal(elt, "compose-textarea");
assert.equal(syntax, "translated: [Quoting…]\n");
$("#compose-textarea").caret(syntax);
});
function set_compose_content_with_caret(content) {
@ -298,6 +300,14 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
$("#compose-textarea").trigger("focus");
}
function get_compose_content_with_caret() {
const content =
textarea_val.slice(0, textarea_caret_pos) +
"%" +
textarea_val.slice(textarea_caret_pos); // insert the "%"
return content;
}
function reset_test_state() {
// Reset `raw_content` property of `selected_message`.
delete selected_message.raw_content;
@ -308,27 +318,17 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
$("#compose-textarea").trigger("blur");
}
function override_with_quote_text(quote_text) {
override(text_field_edit, "replace", (elt, old_syntax, new_syntax) => {
assert.equal(elt, "compose-textarea");
assert.equal(old_syntax, "translated: [Quoting…]");
assert.equal(
new_syntax(),
"translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n" +
"```quote\n" +
`${quote_text}\n` +
"```",
);
});
}
let quote_text = "Testing caret position";
override_with_quote_text(quote_text);
set_compose_content_with_caret("hello %there"); // "%" is used to encode/display position of focus before change
compose_actions.quote_and_reply();
assert.equal(get_compose_content_with_caret(), "hello \ntranslated: [Quoting…]\n%there");
success_function({
raw_content: quote_text,
raw_content: "Testing caret position",
});
assert.equal(
get_compose_content_with_caret(),
"hello \ntranslated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n```quote\nTesting caret position\n```\n%there",
);
reset_test_state();
@ -336,12 +336,15 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
// add a newline before the quoted message.
set_compose_content_with_caret("%hello there");
compose_actions.quote_and_reply();
assert.equal(get_compose_content_with_caret(), "translated: [Quoting…]\n%hello there");
quote_text = "Testing with caret initially positioned at 0.";
override_with_quote_text(quote_text);
success_function({
raw_content: quote_text,
raw_content: "Testing with caret initially positioned at 0.",
});
assert.equal(
get_compose_content_with_caret(),
"translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n```quote\nTesting with caret initially positioned at 0.\n```\n%hello there",
);
override_rewire(compose_actions, "respond_to_message", () => {
// Reset compose state to replicate the re-opening of compose-box.
@ -356,12 +359,15 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
// quoting a message, the quoted message should be placed
// at the beginning of compose-box.
compose_actions.quote_and_reply();
assert.equal(get_compose_content_with_caret(), "translated: [Quoting…]\n%");
quote_text = "Testing with compose-box closed initially.";
override_with_quote_text(quote_text);
success_function({
raw_content: quote_text,
raw_content: "Testing with compose-box closed initially.",
});
assert.equal(
get_compose_content_with_caret(),
"translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n```quote\nTesting with compose-box closed initially.\n```\n%",
);
reset_test_state();
@ -371,12 +377,15 @@ run_test("quote_and_reply", ({override, override_rewire}) => {
// message should start from the beginning of compose-box.
set_compose_content_with_caret(" \n\n \n %");
compose_actions.quote_and_reply();
assert.equal(get_compose_content_with_caret(), "translated: [Quoting…]\n%");
quote_text = "Testing with compose-box containing whitespaces and newlines only.";
override_with_quote_text(quote_text);
success_function({
raw_content: quote_text,
raw_content: "Testing with compose-box containing whitespaces and newlines only.",
});
assert.equal(
get_compose_content_with_caret(),
"translated: @_**Steve Stephenson|90** [said](https://chat.zulip.org/#narrow/stream/92-learning/topic/Tornado):\n```quote\nTesting with compose-box containing whitespaces and newlines only.\n```\n%",
);
});
run_test("set_compose_box_top", () => {

18
static/js/compose_ui.js
View File

@ -1,6 +1,6 @@
import autosize from "autosize";
import $ from "jquery";
import {insert, replace, set, wrapSelection} from "text-field-edit";
import {insert, set, wrapSelection} from "text-field-edit";
import * as common from "./common";
import {$t} from "./i18n";
@ -80,11 +80,17 @@ export function replace_syntax(old_syntax, new_syntax, $textarea = $("#compose-t
// a string it will only replace the first instance. If `old_syntax` is
// a RegExp with a global flag, it will replace all instances.
// We need use anonymous function for `new_syntax` to avoid JavaScript's
// replace() function treating `$`s in new_syntax as special syntax. See
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#Description
// for details.
replace($textarea[0], old_syntax, () => new_syntax);
$textarea.val(
$textarea.val().replace(
old_syntax,
() =>
// We need this anonymous function to avoid JavaScript's
// replace() function treating `$`s in new_syntax as special syntax. See
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace#Description
// for details.
new_syntax,
),
);
}
export function compute_placeholder_text(opts) {