diff --git a/frontends/etiquette_flask/static/js/photo_clipboard.js b/frontends/etiquette_flask/static/js/photo_clipboard.js index 6d0eeba..a7b784c 100644 --- a/frontends/etiquette_flask/static/js/photo_clipboard.js +++ b/frontends/etiquette_flask/static/js/photo_clipboard.js @@ -389,6 +389,15 @@ function on_storage_event() photo_clipboard.update_pagestate(); } +photo_clipboard.register_hotkeys = +function register_hotkeys() +{ + hotkeys.register_hotkey("ctrl a", photo_clipboard.select_all_photos, "Select all photos."); + hotkeys.register_hotkey("ctrl d", photo_clipboard.unselect_all_photos, "Deselect all photos."); + hotkeys.register_hotkey("c", photo_clipboard.clipboard_tray_collapse_toggle, "Toggle clipboard tray."); + hotkeys.register_hotkey("shift c", photo_clipboard.open_full_clipboard_tab, "Open full clipboard page."); +} + photo_clipboard.update_pagestate = function update_pagestate() { @@ -404,10 +413,6 @@ photo_clipboard.on_pageload = function on_pageload() { window.addEventListener("storage", photo_clipboard.on_storage_event, false); - hotkeys.register_hotkey("ctrl a", photo_clipboard.select_all_photos, "Select all photos."); - hotkeys.register_hotkey("ctrl d", photo_clipboard.unselect_all_photos, "Deselect all photos."); - hotkeys.register_hotkey("c", photo_clipboard.clipboard_tray_collapse_toggle, "Toggle clipboard tray."); - hotkeys.register_hotkey("shift c", photo_clipboard.open_full_clipboard_tab, "Open full clipboard page."); photo_clipboard.ingest_toolbox_items(); photo_clipboard.load_clipboard(); photo_clipboard.update_pagestate(); diff --git a/frontends/etiquette_flask/templates/album.html b/frontends/etiquette_flask/templates/album.html index 09022d5..3aa9ea3 100644 --- a/frontends/etiquette_flask/templates/album.html +++ b/frontends/etiquette_flask/templates/album.html @@ -464,6 +464,7 @@ function add_photo_toolbox_entries() } function on_pageload() { + photo_clipboard.register_hotkeys(); add_photo_toolbox_entries(); } document.addEventListener("DOMContentLoaded", on_pageload); diff --git a/frontends/etiquette_flask/templates/clipboard.html b/frontends/etiquette_flask/templates/clipboard.html index 8150347..c13a50e 100644 --- a/frontends/etiquette_flask/templates/clipboard.html +++ b/frontends/etiquette_flask/templates/clipboard.html @@ -400,5 +400,11 @@ function unset_searchhidden_form() const photo_ids = Array.from(photo_clipboard.clipboard); api.photos.batch_unset_searchhidden(photo_ids, set_unset_searchhidden_callback); } + +function on_pageload() +{ + photo_clipboard.register_hotkeys(); +} +document.addEventListener("DOMContentLoaded", on_pageload); diff --git a/frontends/etiquette_flask/templates/photo.html b/frontends/etiquette_flask/templates/photo.html index b2ccbc7..ef8fd72 100644 --- a/frontends/etiquette_flask/templates/photo.html +++ b/frontends/etiquette_flask/templates/photo.html @@ -647,6 +647,7 @@ function on_pageload() { autofocus_add_tag_box(); photo_clipboard.apply_check(document.getElementById("clipboard_checkbox")); + photo_clipboard.register_hotkeys(); } document.addEventListener("DOMContentLoaded", on_pageload); diff --git a/frontends/etiquette_flask/templates/search.html b/frontends/etiquette_flask/templates/search.html index fb27d6b..cc039bd 100644 --- a/frontends/etiquette_flask/templates/search.html +++ b/frontends/etiquette_flask/templates/search.html @@ -713,5 +713,11 @@ input_forbids.addEventListener("keyup", tag_input_hook_forbids); common.bind_box_to_button(input_forbids, search_go_button, true); common.bind_box_to_button(input_expression, search_go_button); + +function on_pageload() +{ + photo_clipboard.register_hotkeys(); +} +document.addEventListener("DOMContentLoaded", on_pageload);