From 443da9a330911096e6557c4007640e1bf2157c37 Mon Sep 17 00:00:00 2001
From: Ryo Hilmawan <54142180+CloudHill@users.noreply.github.com>
Date: Mon, 23 Nov 2020 17:05:18 +0700
Subject: [PATCH] Reordered side panel content loading

---
 mods/side-panel/mod.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/mods/side-panel/mod.js b/mods/side-panel/mod.js
index a4f765f..f70ac47 100644
--- a/mods/side-panel/mod.js
+++ b/mods/side-panel/mod.js
@@ -151,19 +151,21 @@ module.exports = {
           function loadContent(mod) {
             if (curPanelJs && curPanelJs.onSwitch) curPanelJs.onSwitch();
 
+            if (mod.panelJs) {
+              curPanelJs = require(mod.panelJs)(store(mod.id));
+            } else curPanelJs = null;
+
             store().last_open = mod.id;
             panel.querySelector('.enhancer-panel--title').innerText = mod.panel.name || mod.name;
             panel.querySelector('.enhancer-panel--icon').innerHTML = mod.panelIcon;
             document.getElementById('enhancer-panel--content').innerHTML = mod.panelHtml;
-
-            if (mod.panelJs) {
-              curPanelJs = require(mod.panelJs)(store(mod.id));
-              if (curPanelJs && curPanelJs.onLoad) curPanelJs.onLoad();
-            } else curPanelJs = null;
-
+            
             if (mod.panelFullHeight) {
               panel.dataset.fullHeight = mod.panelFullHeight;
             } else panel.dataset.fullHeight = '';
+
+            if (curPanelJs && curPanelJs.onLoad)
+              curPanelJs.onLoad();
           }
 
           function unlockPanel(animate) {