From c5ca2de4e97d108a654960e4244771d61935bf4e Mon Sep 17 00:00:00 2001 From: Arkshine Date: Mon, 8 Jan 2024 21:04:23 +0100 Subject: [PATCH] FIX: Syntax and settings issues (#21) --- javascripts/discourse/components/modal/insert-jitsi.gjs | 3 ++- javascripts/discourse/initializers/insert-jitsi.js | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/javascripts/discourse/components/modal/insert-jitsi.gjs b/javascripts/discourse/components/modal/insert-jitsi.gjs index c233980..7aef283 100644 --- a/javascripts/discourse/components/modal/insert-jitsi.gjs +++ b/javascripts/discourse/components/modal/insert-jitsi.gjs @@ -1,3 +1,5 @@ +/*eslint no-undef:0 */ + import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { Input } from "@ember/component"; @@ -5,7 +7,6 @@ import { action } from "@ember/object"; import DButton from "discourse/components/d-button"; import DModal from "discourse/components/d-modal"; import TextField from "discourse/components/text-field"; -import themePrefix from "discourse/helpers/theme-prefix"; import i18n from "discourse-common/helpers/i18n"; export default class InsertJitsi extends Component { diff --git a/javascripts/discourse/initializers/insert-jitsi.js b/javascripts/discourse/initializers/insert-jitsi.js index e444039..a514607 100644 --- a/javascripts/discourse/initializers/insert-jitsi.js +++ b/javascripts/discourse/initializers/insert-jitsi.js @@ -1,5 +1,5 @@ +/*eslint no-undef:0 */ /* global JitsiMeetExternalAPI */ -import themePrefix from "discourse/helpers/theme-prefix"; import loadScript from "discourse/lib/load-script"; import { withPluginApi } from "discourse/lib/plugin-api"; import { iconHTML } from "discourse-common/lib/icon-library"; @@ -75,10 +75,9 @@ export default { withPluginApi("0.8.31", (api) => { const currentUser = api.getCurrentUser(); const modal = api.container.lookup("service:modal"); - const settings = api.container.lookup("site-settings:main"); if (settings.show_in_options_dropdown) { - if (settings.only_available_to_staff && currentUser?.staff) { + if (!settings.only_available_to_staff || currentUser?.staff) { api.addComposerToolbarPopupMenuOption({ icon: settings.button_icon, label: themePrefix("composer_title"),