Fix enqueue and syntax errors

DiscipleTools · Dec 16, 2024 · a756693 · a756693
1 parent d37c726
commit a756693
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/dt-core/admin/components/setup-wizard-modules.js b/dt-core/admin/components/setup-wizard-modules.js
@@ -24,7 +24,7 @@ export class SetupWizardModules extends OpenLitElement {
         super()
 
         this.stage = 'prompt'
-        this.data = setupWizardShare.data
+        this.data = window.setupWizardShare.data
         this.useCases = []
         this.option = {}
     }

diff --git a/dt-core/admin/components/setup-wizard.js b/dt-core/admin/components/setup-wizard.js
@@ -240,7 +240,7 @@ export class SetupWizard extends LitElement {
     constructor() {
         super()
 
-        this.translations = setupWizardShare.translations
+        this.translations = window.setupWizardShare.translations
         this.steps = []
         this.currentStepNumber = 0
 
@@ -250,8 +250,8 @@ export class SetupWizard extends LitElement {
     }
 
     firstUpdated() {
-        if (this.steps.length === 0 && setupWizardShare && setupWizardShare.steps && setupWizardShare.steps.length !== 0) {
-            this.steps = setupWizardShare.steps
+        if (this.steps.length === 0 && window.setupWizardShare && window.setupWizardShare.steps && window.setupWizardShare.steps.length !== 0) {
+            this.steps = window.setupWizardShare.steps
         }
     }
 

diff --git a/dt-core/admin/menu/menu-setup-wizard.php b/dt-core/admin/menu/menu-setup-wizard.php
@@ -36,6 +36,11 @@ public function __construct() {
             remove_action( 'network_admin_notices', 'update_nag', 3 );
             remove_action( 'network_admin_notices', 'maintenance_nag', 3 );
         });
+        add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
+        add_filter( 'script_loader_tag', [ $this, 'filter_script_loader_tag' ], 10, 2 );
+    }
+
+    public function enqueue_scripts(){
         dt_theme_enqueue_script( 'setup-wizard', 'dt-core/admin/components/setup-wizard.js', [], true );
         dt_theme_enqueue_script( 'setup-wizard-open-element', 'dt-core/admin/components/setup-wizard-open-element.js', [ 'setup-wizard' ], true );
         dt_theme_enqueue_script( 'setup-wizard-modules', 'dt-core/admin/components/setup-wizard-modules.js', [ 'setup-wizard', 'setup-wizard-open-element' ], true );
@@ -52,7 +57,6 @@ public function __construct() {
             'steps' => $this->setup_wizard_steps(),
             'data' => $this->setup_wizard_data(),
         ] );
-        add_filter( 'script_loader_tag', [ $this, 'filter_script_loader_tag' ], 10, 2 );
     }
 
     public function has_access_permission() {

diff --git a/package.json b/package.json
@@ -9,6 +9,7 @@
   "author": "Disciple.Tools",
   "license": "GPL-2.0-or-later",
   "homepage": "https://disciple.tools",
+  "type": "module",
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.2",
     "@babel/preset-env": "^7.24.4",