Merge pull request #38689 from iamejaaz/ui-ux-improvement
feat: toggle awesomebar
This commit is contained in:
commit
fe0e46b37c
3 changed files with 28 additions and 19 deletions
|
|
@ -522,25 +522,28 @@ class DesktopPage {
|
|||
if (frappe.boot.desk_settings.search_bar) {
|
||||
let awesome_bar = new frappe.search.AwesomeBar();
|
||||
awesome_bar.setup(".desktop-search-wrapper #desktop-navbar-modal-search");
|
||||
|
||||
frappe.ui.keys.add_shortcut({
|
||||
shortcut: "ctrl+g",
|
||||
action: function (e) {
|
||||
$(".desktop-search-wrapper #desktop-navbar-modal-search").click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
},
|
||||
description: __("Open Awesomebar"),
|
||||
ignore_inputs: true,
|
||||
});
|
||||
frappe.ui.keys.add_shortcut({
|
||||
shortcut: "ctrl+k",
|
||||
action: function (e) {
|
||||
$(".desktop-search-wrapper #desktop-navbar-modal-search").click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
},
|
||||
description: __("Toggle Awesomebar"),
|
||||
ignore_inputs: true,
|
||||
});
|
||||
}
|
||||
frappe.ui.keys.add_shortcut({
|
||||
shortcut: "ctrl+g",
|
||||
action: function (e) {
|
||||
$(".desktop-search-wrapper #desktop-navbar-modal-search").click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
},
|
||||
description: __("Open Awesomebar"),
|
||||
});
|
||||
frappe.ui.keys.add_shortcut({
|
||||
shortcut: "ctrl+k",
|
||||
action: function (e) {
|
||||
$(".desktop-search-wrapper #desktop-navbar-modal-search").click();
|
||||
e.preventDefault();
|
||||
return false;
|
||||
},
|
||||
description: __("Open Awesomebar"),
|
||||
});
|
||||
}
|
||||
handle_route_change() {
|
||||
const me = this;
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ frappe.ui.keys.add_shortcut({
|
|||
return false;
|
||||
},
|
||||
description: __("Open Awesomebar"),
|
||||
ignore_inputs: true,
|
||||
});
|
||||
|
||||
frappe.ui.keys.add_shortcut({
|
||||
|
|
@ -215,6 +216,7 @@ frappe.ui.keys.add_shortcut({
|
|||
return false;
|
||||
},
|
||||
description: __("Open Awesomebar"),
|
||||
ignore_inputs: true,
|
||||
});
|
||||
|
||||
frappe.ui.keys.add_shortcut({
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ frappe.search.AwesomeBar = class AwesomeBar {
|
|||
<span>${__("to select")}</span>
|
||||
</span>
|
||||
<span class="help-item-navigate">
|
||||
<span class="help-item help-item-escape">${__("esc")}</span>
|
||||
<span class="help-item help-item-escape">${frappe.utils.is_mac() ? "⌘K" : "Ctrl+K"}</span>
|
||||
<span>${__("to close")}</span>
|
||||
</span>
|
||||
</div>
|
||||
|
|
@ -68,6 +68,10 @@ frappe.search.AwesomeBar = class AwesomeBar {
|
|||
});
|
||||
|
||||
$search_element.on("click", () => {
|
||||
if ($(search_modal).hasClass("show")) {
|
||||
search_modal.modal("hide");
|
||||
return;
|
||||
}
|
||||
search_modal.modal("show");
|
||||
|
||||
if (is_event_listeners_added) return;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue