From 75e314ff7e411123ce4b627967ef96c7c9e828c5 Mon Sep 17 00:00:00 2001
From: Evilham <contact@evilham.com>
Date: Thu, 10 Nov 2022 16:28:33 +0100
Subject: [PATCH] [NC] Remove jQuery dependency for theme's navbar.js

It wasn't really necessary and could lead to the whole megamenu not
being loaded under certain circumstances.
---
 dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js      | 4 ++--
 .../nextcloud/src/themes/dd/core/templates/layout.user.php    | 1 -
 dd-ctl                                                        | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js b/dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js
index fd9aaca..9e72ea5 100644
--- a/dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js
+++ b/dd-apps/docker/nextcloud/src/themes/dd/core/js/navbar.js
@@ -1,5 +1,6 @@
 /*
 *   Copyright © 2021,2022 IsardVDI S.L.
+*   Copyright © 2022 Evilham <contact@evilham.com>
 *
 *   This file is part of DD
 *
@@ -18,7 +19,7 @@
 *
 * SPDX-License-Identifier: AGPL-3.0-or-later
 */
-jQuery(document).ready(() => {
+document.addEventListener("DOMContentLoaded", () => {
     base_url = `${window.location.protocol}//${window.location.host.replace(/^nextcloud\./, 'api.')}`
     $.getJSON(`${base_url}/json`, (result) => {
         if (result.logo) {
@@ -32,7 +33,6 @@ jQuery(document).ready(() => {
         }
     })
     $.get(`${base_url}/header/html/nextcloud`, (result) => {
-        console.log(result)
         $("#settings").before(result)
         $('#dropdownMenuAppsButton').click(() => {
             $('#dropdownMenuApps').toggle()
diff --git a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
index bcf4056..109337c 100644
--- a/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
+++ b/dd-apps/docker/nextcloud/src/themes/dd/core/templates/layout.user.php
@@ -53,7 +53,6 @@
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
 		<link rel="manifest" href="<?php print_unescaped(image_path($_['appid'], 'manifest.json')); ?>">
-        <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/dd/core/js/jquery_slim_3.2.1.js"></script>
 		<link rel="stylesheet" href="<?php p($api_url) ?>/css/font-awesome-4.7.0/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php p($api_url) ?>/css/dd.css">
         <script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="/themes/dd/core/js/navbar.js"></script>
diff --git a/dd-ctl b/dd-ctl
index a70a4b7..e7648f5 100755
--- a/dd-ctl
+++ b/dd-ctl
@@ -741,7 +741,6 @@ upgrade_plugins_moodle(){
 }
 
 upgrade_plugins_nextcloud(){
-	wget https://code.jquery.com/jquery-3.2.1.slim.min.js -O "$SRC_FOLDER/nextcloud/themes/dd/core/js/jquery_slim_3.2.1.js"
 	cp -R dd-apps/docker/nextcloud/src/* "$SRC_FOLDER/nextcloud/"
 	nextcloud_upgrade
 }