mirror of https://github.com/zulip/zulip.git
tooltips: Add hotkey hints support to narrow to compose option.
This commit is contained in:
parent
fc6b4775be
commit
4a7ad5325a
|
@ -5,7 +5,6 @@ import tippy, {delegate} from "tippy.js";
|
||||||
import render_message_inline_image_tooltip from "../templates/message_inline_image_tooltip.hbs";
|
import render_message_inline_image_tooltip from "../templates/message_inline_image_tooltip.hbs";
|
||||||
import render_narrow_to_compose_recipients_tooltip from "../templates/narrow_to_compose_recipients_tooltip.hbs";
|
import render_narrow_to_compose_recipients_tooltip from "../templates/narrow_to_compose_recipients_tooltip.hbs";
|
||||||
|
|
||||||
import * as common from "./common";
|
|
||||||
import * as compose_state from "./compose_state";
|
import * as compose_state from "./compose_state";
|
||||||
import {$t} from "./i18n";
|
import {$t} from "./i18n";
|
||||||
import * as message_lists from "./message_lists";
|
import * as message_lists from "./message_lists";
|
||||||
|
@ -273,10 +272,7 @@ export function initialize() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const shortcut_html = (common.has_mac_keyboard() ? "⌘" : "Ctrl") + " + .";
|
return parse_html(render_narrow_to_compose_recipients_tooltip({display_current_view}));
|
||||||
return parse_html(
|
|
||||||
render_narrow_to_compose_recipients_tooltip({shortcut_html, display_current_view}),
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
onHidden(instance) {
|
onHidden(instance) {
|
||||||
instance.destroy();
|
instance.destroy();
|
||||||
|
|
|
@ -227,8 +227,6 @@ function initialize_compose_box() {
|
||||||
scroll_to_bottom_key_html: common.has_mac_keyboard()
|
scroll_to_bottom_key_html: common.has_mac_keyboard()
|
||||||
? "Fn + <span class='tooltip_right_arrow'>→</span>"
|
? "Fn + <span class='tooltip_right_arrow'>→</span>"
|
||||||
: "End",
|
: "End",
|
||||||
narrow_to_compose_recipients_key_html:
|
|
||||||
(common.has_mac_keyboard() ? "⌘" : "Ctrl") + " + .",
|
|
||||||
max_stream_name_length: page_params.max_stream_name_length,
|
max_stream_name_length: page_params.max_stream_name_length,
|
||||||
max_topic_length: page_params.max_topic_length,
|
max_topic_length: page_params.max_topic_length,
|
||||||
}),
|
}),
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
<span>{{t 'Go to conversation' }}</span> <span class="hotkey-hint">({{shortcut_html}})</span>
|
<div>
|
||||||
|
<span>{{t 'Go to conversation' }}</span>
|
||||||
{{#if display_current_view}}
|
{{#if display_current_view}}
|
||||||
<p class="narrow_to_compose_recipient_current_view_help">{{display_current_view}}</p>
|
<p class="narrow_to_compose_recipient_current_view_help">{{display_current_view}}</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
</div>
|
||||||
|
{{hotkey_hints "Ctrl" "."}}
|
||||||
|
|
Loading…
Reference in New Issue