From a8ca82b11f8f09f5eed8b81683112582020c55e8 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 19 Nov 2024 23:25:02 +0100 Subject: [PATCH] DEV: convert keyboard-shortcuts-help to gjs (#29831) --- ...ts-help.js => keyboard-shortcuts-help.gjs} | 35 +++++++++++++++++++ .../modal/keyboard-shortcuts-help.hbs | 29 --------------- 2 files changed, 35 insertions(+), 29 deletions(-) rename app/assets/javascripts/discourse/app/components/modal/{keyboard-shortcuts-help.js => keyboard-shortcuts-help.gjs} (90%) delete mode 100644 app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs diff --git a/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.gjs similarity index 90% rename from app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js rename to app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.gjs index 776000c6ca9..4d1fa20a1b1 100644 --- a/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.js +++ b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.gjs @@ -1,5 +1,8 @@ import Component from "@glimmer/component"; +import { concat } from "@ember/helper"; import { service } from "@ember/service"; +import { htmlSafe } from "@ember/template"; +import DModal from "discourse/components/d-modal"; import { extraKeyboardShortcutsHelp } from "discourse/lib/keyboard-shortcuts"; import { translateModKey } from "discourse/lib/utilities"; import { i18n } from "discourse-i18n"; @@ -353,4 +356,36 @@ export default class KeyboardShortcutsHelp extends Component { }); return shortcuts; } + + } diff --git a/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs b/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs deleted file mode 100644 index 432ca8db0e4..00000000000 --- a/app/assets/javascripts/discourse/app/components/modal/keyboard-shortcuts-help.hbs +++ /dev/null @@ -1,29 +0,0 @@ - - <:body> -
-
- - {{! A11Y, allows keyboard users to scroll modal body }} - {{#each-in this.shortcuts as |category shortcutCategory|}} -
-

{{i18n - (concat "keyboard_shortcuts_help." category ".title") - }}

-
    - {{#each-in shortcutCategory.shortcuts as |name shortcut|}} -
  • {{html-safe shortcut}}
  • - {{/each-in}} -
-
- {{/each-in}} -
-
- -
\ No newline at end of file