Extract side effects from navigation.js file

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Jun 30, 2022 · ac55dab · ac55dab
1 parent 9c09feb
commit ac55dab
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/js/src/main.js b/js/src/main.js
@@ -26,3 +26,5 @@ $(Functions.dismissNotifications());
 $(Functions.initializeMenuResizer());
 $(Functions.floatingMenuBar());
 $(Functions.breadcrumbScrollToTop());
+
+$(Navigation.onload());
diff --git a/js/src/navigation.js b/js/src/navigation.js
@@ -274,9 +274,9 @@ Navigation.traverseForPaths = function () {
 };
 
 /**
- * Executed on page load
+ * @return {function}
  */
-$(function () {
+Navigation.onload = () => function () {
     if (! $('#pma_navigation').length) {
         // Don't bother running any code if the navigation is not even on the page
         return;
@@ -327,7 +327,7 @@ $(function () {
         Navigation.reload(hideNav);
     });
 
-    $(document).on('change', '#navi_db_select',  function () {
+    $(document).on('change', '#navi_db_select', function () {
         if (! $(this).val()) {
             window.CommonParams.set('db', '');
             Navigation.reload();
@@ -582,7 +582,7 @@ $(function () {
             Navigation.reload();
         }
     }
-});
+};
 
 /**
  * Expands a node in navigation tree.

diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php
@@ -145,8 +145,8 @@ private function addDefaultScripts(): void
         $this->scripts->addFile('config.js');
         $this->scripts->addFile('doclinks.js');
         $this->scripts->addFile('functions.js');
-        $this->scripts->addFile('main.js');
         $this->scripts->addFile('navigation.js');
+        $this->scripts->addFile('main.js');
         $this->scripts->addFile('indexes.js');
         $this->scripts->addFile('common.js');
         $this->scripts->addFile('page_settings.js');