Fix tree-view for mail failing on initial load

extensions/mail/mail.src.js

@@ -25,7 +25,9 @@ const mail = (function() {
         js: v___server_js_path
       },
       var: {
-        mail: $t_uri_webmail
+        mail: function() {
+          return $t_uri_webmail
+        }
       }
     };
 
@@ -44,14 +46,6 @@ const mail = (function() {
         },
       };
 
-    // Load dependencies
-    (() => {
-      _g.load.bundle(_g.path.js + "/" + data.files.fancytree,
-        _g.path.css + "/" + data.files.fancytree,
-        (_g.var.mail ? [get] : 0), 1
-      );
-    })();
-
     // Get folders data
     function get(key) {
       key = key ? ('?key=' + key.replace(/&/g, '%26')) : String();
@@ -75,6 +69,12 @@ const mail = (function() {
       container: '[' + data.selectors.folders + ']',
       init: function(source) {
 
+        // Load dependencies
+        if (typeof $.ui !== 'object') {
+          this.load();
+          return;
+        }
+
         // Insert tree container
         if ($(data.selectors.navigation + ' ' + this.container).length === 0) {
           $(data.selectors.navigation).prepend('<div ' + data.selectors.folders + '></div>');
@@ -112,6 +112,12 @@ const mail = (function() {
         let expanded = node.isExpanded();
         !expanded && node.toggleExpanded();
       },
+      load: function() {
+        _g.load.bundle(_g.path.js + "/" + data.files.fancytree,
+          _g.path.css + "/" + data.files.fancytree,
+          (_g.var.mail() ? [get] : 0), 1
+        );
+      },
       reload: function(source) {
         let tree = $(this.container).fancytree("getTree");
         tree.$container.empty();

theme.info

@@ -1,7 +1,7 @@
 desc=Authentic Theme
 longdesc=Webmin/Usermin/Virtualmin/Cloudmin theme based on Bootstrap and Font Awesome (https://github.com/qooob/authentic-theme)
 version=19.17
-mversion=3
+mversion=4
 depends=1.880 1.740
 webmin=1
 usermin=1