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

compose: Use file_input class for file input element.

Browse Source 
In both compose and `message_edit_form` we use `file_input`
class to identify the file `input` element. This will help
to more easily share common elements between compose and message_edit.
This commit is contained in:
Aman Agrawal
2021-04-20 14:14:55 +00:00
committed by Tim Abbott
parent eae1829ead
commit 7ae04a6ba8
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/compose.js
View File

@@ -1510,11 +1510,11 @@ test_ui("on_events", (override) => {
(function test_attach_files_compose_clicked() { (function test_attach_files_compose_clicked() {
const handler = $("#compose").get_on_handler("click", "#attach_files"); const handler = $("#compose").get_on_handler("click", "#attach_files");
$("#file_input").clone = (param) => { $("#compose .file_input").clone = (param) => {
assert(param); assert(param);
}; };
let compose_file_input_clicked = false; let compose_file_input_clicked = false;
$("#compose #file_input").on("click", () => { $("#compose .file_input").on("click", () => {
compose_file_input_clicked = true; compose_file_input_clicked = true;
}); });

9
frontend_tests/node_tests/upload.js
View File

@@ -71,7 +71,10 @@ test("get_item", () => {
upload.get_item("send_status_message", {mode: "compose"}), upload.get_item("send_status_message", {mode: "compose"}),
$("#compose-error-msg"), $("#compose-error-msg"),
); );
assert.equal(upload.get_item("file_input_identifier", {mode: "compose"}), "#file_input"); assert.equal(
upload.get_item("file_input_identifier", {mode: "compose"}),
"#compose .file_input",
);
assert.equal(upload.get_item("source", {mode: "compose"}), "compose-file-input"); assert.equal(upload.get_item("source", {mode: "compose"}), "compose-file-input");
assert.equal(upload.get_item("drag_drop_container", {mode: "compose"}), $("#compose")); assert.equal(upload.get_item("drag_drop_container", {mode: "compose"}), $("#compose"));
assert.equal( assert.equal(
@@ -116,7 +119,7 @@ test("get_item", () => {
assert.equal( assert.equal(
upload.get_item("file_input_identifier", {mode: "edit", row: 123}), upload.get_item("file_input_identifier", {mode: "edit", row: 123}),
`#message_edit_file_input_${CSS.escape(123)}`, `#edit_form_${CSS.escape(123)} .file_input`,
); );
assert.equal(upload.get_item("source", {mode: "edit", row: 123}), "message-edit-file-input"); assert.equal(upload.get_item("source", {mode: "edit", row: 123}), "message-edit-file-input");
assert.equal( assert.equal(
@@ -385,7 +388,7 @@ test("uppy_config", () => {
test("file_input", (override) => { test("file_input", (override) => {
upload.setup_upload({mode: "compose"}); upload.setup_upload({mode: "compose"});
const change_handler = $("body").get_on_handler("change", "#file_input"); const change_handler = $("body").get_on_handler("change", "#compose .file_input");
const files = ["file1", "file2"]; const files = ["file1", "file2"];
const event = { const event = {
target: { target: {

2
static/js/click_handlers.js
View File

@@ -336,7 +336,7 @@ export function initialize() {
e.preventDefault(); e.preventDefault();
const row_id = rows.id($(this).closest(".message_row")); const row_id = rows.id($(this).closest(".message_row"));
$(`#message_edit_file_input_${CSS.escape(row_id)}`).trigger("click"); $(`#edit_form_${CSS.escape(row_id)} .file_input`).trigger("click");
}); });
$("body").on("click", ".message_edit_form [id^='markdown_preview_']", function (e) { $("body").on("click", ".message_edit_form [id^='markdown_preview_']", function (e) {

2
static/js/compose.js
View File

@@ -1231,7 +1231,7 @@ export function initialize() {
$("#compose").on("click", "#attach_files", (e) => { $("#compose").on("click", "#attach_files", (e) => {
e.preventDefault(); e.preventDefault();
$("#compose #file_input").trigger("click"); $("#compose .file_input").trigger("click");
}); });
$("body").on("click", ".video_link", (e) => { $("body").on("click", ".video_link", (e) => {

4
static/js/upload.js
View File

@@ -50,7 +50,7 @@ export function get_item(key, config) {
case "send_status_message": case "send_status_message":
return $("#compose-error-msg"); return $("#compose-error-msg");
case "file_input_identifier": case "file_input_identifier":
return "#file_input"; return "#compose .file_input";
case "source": case "source":
return "compose-file-input"; return "compose-file-input";
case "drag_drop_container": case "drag_drop_container":
@@ -82,7 +82,7 @@ export function get_item(key, config) {
case "send_status_message": case "send_status_message":
return $(`#message-edit-send-status-${CSS.escape(config.row)}`).find(".error-msg"); return $(`#message-edit-send-status-${CSS.escape(config.row)}`).find(".error-msg");
case "file_input_identifier": case "file_input_identifier":
return `#message_edit_file_input_${CSS.escape(config.row)}`; return `#edit_form_${CSS.escape(config.row)} .file_input`;
case "source": case "source":
return "message-edit-file-input"; return "message-edit-file-input";
case "drag_drop_container": case "drag_drop_container":

2
static/templates/compose_control_buttons.hbs
View File

@@ -1,4 +1,4 @@
<input type="file" id="file_input" class="notvisible pull-left" multiple /> <input type="file" class="file_input notvisible pull-left" multiple />
{{#if file_upload_enabled }} {{#if file_upload_enabled }}
<a role="button" class="compose_control_button fa fa-paperclip notdisplayed" aria-label="{{t 'Attach files' }}" id="attach_files" tabindex=0 title="{{t 'Attach files' }}"></a> <a role="button" class="compose_control_button fa fa-paperclip notdisplayed" aria-label="{{t 'Attach files' }}" id="attach_files" tabindex=0 title="{{t 'Attach files' }}"></a>
{{/if}} {{/if}}

2
static/templates/message_edit_form.hbs
View File

@@ -58,7 +58,7 @@
<button type="button" class="button small rounded message_edit_cancel">{{t "Cancel" }}</button> <button type="button" class="button small rounded message_edit_cancel">{{t "Cancel" }}</button>
{{#if is_content_editable}} {{#if is_content_editable}}
<div class="message-edit-feature-group"> <div class="message-edit-feature-group">
<input type="file" id="message_edit_file_input_{{message_id}}" class="notvisible pull-left" multiple /> <input type="file" class="file_input notvisible pull-left" multiple />
{{#if file_upload_enabled}} {{#if file_upload_enabled}}
<a role="button" tabindex=0 class="compose_control_button fa fa-paperclip notdisplayed" aria-label="{{t "Attach files" }}" id="attach_files_{{message_id}}" title="{{t "Attach files" }}"></a> <a role="button" tabindex=0 class="compose_control_button fa fa-paperclip notdisplayed" aria-label="{{t "Attach files" }}" id="attach_files_{{message_id}}" title="{{t "Attach files" }}"></a>
{{/if}} {{/if}}