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

timestamp: Extract show_flatpickr() in composebox_typeahead.

Browse Source 
The time_jump typeahead code now reads like other typeaheads,
uncluttered with the flatpickr logic.
This commit is contained in:
Rohitt Vashishtha
2020-07-06 15:00:52 +05:30
committed by Tim Abbott
parent 18537b63f5
commit ca73d81bba
1 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
static/js/composebox_typeahead.js
View File

@@ -768,6 +768,37 @@ exports.content_highlighter = function (item) {
} }
}; };
const show_flatpickr = (element, callback, default_timestamp) => {
const flatpickr_input = $("<input id='#timestamp_flatpickr'>");
const instance = flatpickr_input.flatpickr({
mode: 'single',
enableTime: true,
clickOpens: false,
defaultDate: default_timestamp || moment().format(),
plugins: [new confirmDatePlugin({})], // eslint-disable-line new-cap, no-undef
positionElement: element,
dateFormat: 'Z',
formatDate: (date) => {
const dt = moment(date);
return dt.local().format();
},
});
const container = $($(instance.innerContainer).parent());
container.on('click', '.flatpickr-calendar', (e) => {
e.stopPropagation();
e.preventDefault();
});
container.on('click', '.flatpickr-confirm', () => {
callback(flatpickr_input.val());
instance.close();
instance.destroy();
});
instance.open();
container.find('.flatpickr-monthDropdown-months').focus();
};
exports.content_typeahead_selected = function (item, event) { exports.content_typeahead_selected = function (item, event) {
const pieces = exports.split_at_cursor(this.query, this.$element); const pieces = exports.split_at_cursor(this.query, this.$element);
let beginning = pieces[0]; let beginning = pieces[0];
@@ -854,42 +885,22 @@ exports.content_typeahead_selected = function (item, event) {
const start = beginning.length - this.token.length; const start = beginning.length - this.token.length;
beginning = beginning.substring(0, start) + item + '** '; beginning = beginning.substring(0, start) + item + '** ';
} else if (this.completing === 'time_jump') { } else if (this.completing === 'time_jump') {
const flatpickr_input = $("<input id='#timestamp_flatpickr'>");
let timeobject;
let timestring = beginning.substring(beginning.lastIndexOf('!time')); let timestring = beginning.substring(beginning.lastIndexOf('!time'));
let default_timestamp;
if (timestring.startsWith('!time(') && timestring.endsWith(')')) { if (timestring.startsWith('!time(') && timestring.endsWith(')')) {
timestring = timestring.substring(6, timestring.length - 1); timestring = timestring.substring(6, timestring.length - 1);
moment.suppressDeprecationWarnings = true; moment.suppressDeprecationWarnings = true;
try { try {
// If there's already a time in the compose box here, // If there's already a time in the compose box here,
// we use it to initialize the flatpickr instance. // we use it to initialize the flatpickr instance.
timeobject = moment(timestring).toDate(); default_timestamp = moment(timestring).toDate();
} catch { } catch {
// Otherwise, default to showing the current time. // Otherwise, default to showing the current time.
} }
} }
const instance = flatpickr_input.flatpickr({ const on_timestamp_selection = (val) => {
mode: 'single', const datestr = val;
enableTime: true,
clickOpens: false,
defaultDate: timeobject || moment().format(),
plugins: [new confirmDatePlugin({})], // eslint-disable-line new-cap, no-undef
positionElement: this.$element[0],
dateFormat: 'Z',
formatDate: (date) => {
const dt = moment(date);
return dt.local().format();
},
});
const container = $($(instance.innerContainer).parent());
container.on('click', '.flatpickr-calendar', (e) => {
e.stopPropagation();
e.preventDefault();
});
container.on('click', '.flatpickr-confirm', () => {
const datestr = flatpickr_input.val();
beginning = beginning.substring(0, beginning.lastIndexOf('!time')) + `!time(${datestr}) `; beginning = beginning.substring(0, beginning.lastIndexOf('!time')) + `!time(${datestr}) `;
if (rest.startsWith(')')) { if (rest.startsWith(')')) {
rest = rest.slice(1); rest = rest.slice(1);
@@ -897,11 +908,8 @@ exports.content_typeahead_selected = function (item, event) {
textbox.val(beginning + rest); textbox.val(beginning + rest);
textbox.caret(beginning.length, beginning.length); textbox.caret(beginning.length, beginning.length);
compose_ui.autosize_textarea(); compose_ui.autosize_textarea();
instance.close(); };
instance.destroy(); show_flatpickr(this.$element[0], on_timestamp_selection, default_timestamp);
});
instance.open();
container.find('.flatpickr-monthDropdown-months').focus();
return beginning + rest; return beginning + rest;
} }