diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-02-10 23:56:05 +0100 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-02-17 17:52:03 +0100 |
| commit | 7c8a901b841878c7d63940baa551f5982958874e (patch) | |
| tree | faf0c431d93cad5f294c4b09e14d3c1645f1bb5f /apps/settings/templates | |
| parent | f5d1365bbd32fdcf2084eb2ad727a574529898d0 (diff) | |
| download | nextcloud-server-7c8a901b841878c7d63940baa551f5982958874e.tar.gz nextcloud-server-7c8a901b841878c7d63940baa551f5982958874e.zip | |
Cleanup admin settings js files
* Move admin.js to webpack, so that this use the bundled jquery files
instead of the deprecated window.$ Also fixing formatting
* Remove log.js that seems to be from a time where logreader was bundled
with server and I couldn't find an usage of it anymore
* Fix recent regression in rebuild navigation function (now not depending on
jquery anymore and bundled by webpack).
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/settings/templates')
| -rw-r--r-- | apps/settings/templates/settings/frame.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php index 53987bf6074..6d017f07671 100644 --- a/apps/settings/templates/settings/frame.php +++ b/apps/settings/templates/settings/frame.php @@ -22,7 +22,8 @@ */ style('settings', 'settings'); -script('settings', [ 'settings', 'admin', 'log']); +script('settings', 'settings'); +\OCP\Util::addScript('settings', 'legacy-admin'); script('core', 'setupchecks'); script('files', 'jquery.fileupload'); |