paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

compose: Add spaces around markdown for attachments.

Browse Source 
If your cursor is in the middle of a word when you upload
an image, the code will now properly put spaces in the markdown
around the attachment link.

Fixes: #7212.
This commit is contained in:
elenaoat
2017-11-02 23:01:50 +02:00
committed by Steve Howell
parent 76898dd4d3
commit 7b455f597b
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/upload.js
View File

@@ -93,12 +93,16 @@ var upload_opts = upload.options({ mode: "compose" });
function test(i, response, textbox_val) {
var compose_ui_autosize_textarea_checked = false;
var compose_actions_start_checked = false;
var syntax_to_insert;
function setup() {
$("#compose-textarea").val('');
compose_ui.autosize_textarea = function () {
compose_ui_autosize_textarea_checked = true;
};
compose_ui.insert_syntax_and_focus = function (syntax) {
syntax_to_insert = syntax;
};
compose_state.set_message_type();
global.compose_actions = {
start: function (msg_type) {
@@ -116,8 +120,8 @@ var upload_opts = upload.options({ mode: "compose" });
}
function assert_side_effects() {
assert.equal($("#compose-textarea").val(), textbox_val);
if (response.uri) {
assert.equal(syntax_to_insert, textbox_val);
assert(compose_actions_start_checked);
assert(compose_ui_autosize_textarea_checked);
assert.equal($("#compose-send-button").prop('disabled'), false);
@@ -131,8 +135,8 @@ var upload_opts = upload.options({ mode: "compose" });
assert_side_effects();
}
var msg_1 = '[pasted image](https://foo.com/uploads/122456) ';
var msg_2 = '[foobar.jpeg](https://foo.com/user_uploads/foobar.jpeg) ';
var msg_1 = '[pasted image](https://foo.com/uploads/122456)';
var msg_2 = '[foobar.jpeg](https://foo.com/user_uploads/foobar.jpeg)';
test(-1, {}, '');
test(-1, {uri: 'https://foo.com/uploads/122456'}, msg_1);

6
static/js/upload.js
View File

@@ -114,10 +114,12 @@ exports.options = function (config) {
if (i === -1) {
// This is a paste, so there's no filename. Show the image directly
textarea.val(textarea.val() + "[pasted image](" + uri + ") ");
var pasted_image_uri = "[pasted image](" + uri + ")";
compose_ui.insert_syntax_and_focus(pasted_image_uri);
} else {
// This is a dropped file, so make the filename a link to the image
textarea.val(textarea.val() + "[" + filename + "](" + uri + ")" + " ");
var filename_uri = "[" + filename + "](" + uri + ")";
compose_ui.insert_syntax_and_focus(filename_uri);
}
compose_ui.autosize_textarea();
send_button.prop("disabled", false);