Skip to content

Commit 6416a67

Browse files
committed
fix: Bundle jquery for update request and charts
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
1 parent 55231d9 commit 6416a67

4 files changed

Lines changed: 20 additions & 1 deletion

File tree

REUSE.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,10 @@ path = "js/smoothie.js"
3434
precedence = "aggregate"
3535
SPDX-FileCopyrightText = ["2010-2013 Joe Walnes", "2013-2014 Drew Noakes"]
3636
SPDX-License-Identifier = "MIT"
37+
38+
[[annotations]]
39+
path = "js/jquery-3.7.1.min.js"
40+
precedence = "aggregate"
41+
SPDX-FileCopyrightText = ["OpenJS Foundation and other contributors"]
42+
SPDX-License-Identifier = "MIT"
43+

js/jquery-3.7.1.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/script.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@
5656
window.addEventListener('resize', resizeSystemCharts)
5757

5858
function getThemedPrimaryColor() {
59-
return OCA.Theming ? OCA.Theming.color : 'rgb(54, 129, 195)';
59+
return getComputedStyle(document.documentElement)
60+
.getPropertyValue('--color-primary-element')
61+
.trim() || 'rgb(54, 129, 195)';
6062
}
6163

6264
function getThemedPassiveColor() {
@@ -339,3 +341,10 @@ document.addEventListener('DOMContentLoaded', function (event) {
339341
const $params = document.querySelectorAll('.update-monitoring-endpoint-url');
340342
$params.forEach($param => $param.addEventListener('change', updateMonitoringUrl));
341343
});
344+
345+
$(document).on('ajaxSend', function(elm, xhr, settings) {
346+
if (settings.crossDomain === false) {
347+
xhr.setRequestHeader('requesttoken', document.head.dataset.requesttoken)
348+
xhr.setRequestHeader('OCS-APIREQUEST', 'true')
349+
}
350+
})

templates/settings-admin.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use OCA\ServerInfo\Resources\ThermalZone;
1515
use OCP\Util;
1616

17+
script('serverinfo', 'jquery-3.7.1.min');
1718
script('serverinfo', 'script');
1819
script('serverinfo', 'smoothie');
1920
script('serverinfo', 'Chart.min');

0 commit comments

Comments
 (0)