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

compose: Use calendarContainer to check if flatpickr is open.

Browse Source 
`calendarContainer` is defined for flatpickr instance if it is
open.

This also fixes a bug where the flatpickr doesn't open when
user tries to toggle it using the global time icon in compose.
This commit is contained in:
Aman Agrawal
2021-11-10 14:57:52 +00:00
committed by Tim Abbott
parent 6ce4561004
commit a8c488bc56
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/compose.js
View File

@@ -628,7 +628,7 @@ export function initialize() {
} }
}); });
let instance = null; let instance = {};
$("body").on("click", ".time_pick", (e) => { $("body").on("click", ".time_pick", (e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@@ -640,11 +640,10 @@ export function initialize() {
target_textarea = $(`#edit_form_${CSS.escape(edit_message_id)} .message_edit_content`); target_textarea = $(`#edit_form_${CSS.escape(edit_message_id)} .message_edit_content`);
} }
if (instance === null) { if (!instance.calendarContainer) {
const on_timestamp_selection = (val) => { const on_timestamp_selection = (val) => {
const timestr = `<time:${val}> `; const timestr = `<time:${val}> `;
compose_ui.insert_syntax_and_focus(timestr, target_textarea); compose_ui.insert_syntax_and_focus(timestr, target_textarea);
instance = null;
}; };
instance = composebox_typeahead.show_flatpickr( instance = composebox_typeahead.show_flatpickr(
@@ -656,16 +655,11 @@ export function initialize() {
position: "above center", position: "above center",
}, },
); );
$(document).one("compose_canceled.zulip compose_finished.zulip", () => {
instance = null;
});
return; return;
} }
instance.close(); instance.close();
instance.destroy(); instance.destroy();
instance = null;
}); });
$("#compose").on("click", ".markdown_preview", (e) => { $("#compose").on("click", ".markdown_preview", (e) => {