Merge pull request #38567 from nextcloud/chore/remove-deprecated-legacy-loader

Remove deprecated legacy loader from `OC`

core/src/OC/index.js

@@ -24,7 +24,6 @@
 
 import { subscribe } from '@nextcloud/event-bus'
 
-import { addScript, addStyle } from './legacy-loader.js'
 import {
 	ajaxConnectionLostHandler,
 	processAjaxError,
@@ -137,8 +136,6 @@ export default {
 	 */
 	fileIsBlacklisted: file => !!(file.match(Config.blacklist_files_regex)),
 
-	addScript,
-	addStyle,
 	AppConfig,
 	appConfig,
 	appswebroots,

core/src/OC/legacy-loader.js

@@ -1,79 +0,0 @@
-/**
- * @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author John Molakvoæ <skjnldsv@protonmail.com>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0-or-later
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/** @typedef {import('jquery')} jQuery */
-import $ from 'jquery'
-import { generateFilePath } from '@nextcloud/router'
-
-const loadedScripts = {}
-const loadedStyles = []
-
-/**
- * Load a script for the server and load it. If the script is already loaded,
- * the event handler will be called directly
- *
- * @param {string} app the app id to which the script belongs
- * @param {string} script the filename of the script
- * @param {Function} ready event handler to be called when the script is loaded
- * @return {jQuery.Deferred}
- * @deprecated 16.0.0 Use OCP.Loader.loadScript
- */
-export const addScript = (app, script, ready) => {
-	console.warn('OC.addScript is deprecated, use OCP.Loader.loadScript instead')
-
-	let deferred
-	const path = generateFilePath(app, 'js', script + '.js')
-	if (!loadedScripts[path]) {
-		deferred = $.Deferred()
-		$.getScript(path, () => deferred.resolve())
-		loadedScripts[path] = deferred
-	} else {
-		if (ready) {
-			ready()
-		}
-	}
-	return loadedScripts[path]
-}
-
-/**
- * Loads a CSS file
- *
- * @param {string} app the app id to which the css style belongs
- * @param {string} style the filename of the css file
- * @deprecated 16.0.0 Use OCP.Loader.loadStylesheet
- */
-export const addStyle = (app, style) => {
-	console.warn('OC.addStyle is deprecated, use OCP.Loader.loadStylesheet instead')
-
-	const path = generateFilePath(app, 'css', style + '.css')
-	if (loadedStyles.indexOf(path) === -1) {
-		loadedStyles.push(path)
-		if (document.createStyleSheet) {
-			document.createStyleSheet(path)
-		} else {
-			style = $('<link rel="stylesheet" type="text/css" href="' + path + '"/>')
-			$('head').append(style)
-		}
-	}
-}