upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Allow scripts prioritization based on other apps

Browse source 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2021-11-30 15:46:09 +01:00
parent 6b3c703794
commit 71a3528510
No known key found for this signature in database
GPG key ID: 60C25B8C072916CF
6 changed files with 90 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/files_sharing/lib/Listener/LoadAdditionalListener.php
View file

@ -37,8 +37,10 @@ class LoadAdditionalListener implements IEventListener {
return;
}
Util::addScript(Application::APP_ID, 'dist/files_sharing');
Util::addScript(Application::APP_ID, 'dist/additionalScripts');
// After files for the files list shared content
Util::addScript(Application::APP_ID, 'dist/files_sharing', 'files');
// After files for the breadcrumb share indicator
Util::addScript(Application::APP_ID, 'dist/additionalScripts', 'files');
Util::addStyle(Application::APP_ID, 'icons');
}
}

2
apps/files_sharing/lib/Listener/LoadSidebarListener.php
View file

@ -37,6 +37,6 @@ class LoadSidebarListener implements IEventListener {
return;
}
Util::addScript(Application::APP_ID, 'dist/files_sharing_tab');
Util::addScript(Application::APP_ID, 'dist/files_sharing_tab', 'files');
}
}

3
apps/systemtags/lib/AppInfo/Application.php
View file

@ -52,8 +52,7 @@ class Application extends App implements IBootstrap {
$dispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function () {
// FIXME: no public API for these ?
\OCP\Util::addScript('dist/systemtags');
\OCP\Util::addScript('core', 'dist/systemtags');
\OCP\Util::addScript(self::APP_ID, 'systemtags');
}
);

4
lib/private/TemplateLayout.php
View file

@ -96,7 +96,7 @@ class TemplateLayout extends \OC_Template {
$this->initialState->provideInitialState('core', 'active-app', $this->navigationManager->getActiveEntry());
$this->initialState->provideInitialState('unified-search', 'limit-default', SearchQuery::LIMIT_DEFAULT);
Util::addScript('dist/unified-search', null, true);
Util::addScript('core', 'dist/unified-search', 'core');
// Add navigation entry
$this->assign('application', '');
@ -209,7 +209,7 @@ class TemplateLayout extends \OC_Template {
}
// Add the js files
$jsFiles = self::findJavascriptFiles(\OC_Util::$scripts);
$jsFiles = self::findJavascriptFiles(array_merge(\OC_Util::$scripts, Util::getScripts()));
$this->assign('jsfiles', []);
if ($this->config->getSystemValue('installed', false) && $renderAs != TemplateResponse::RENDER_AS_ERROR) {
// this is on purpose outside of the if statement below so that the initial state is prefilled (done in the getConfig() call)

4
lib/private/legacy/OC_Util.php
View file

@ -580,6 +580,8 @@ class OC_Util {
/**
* add a javascript file
*
* @deprecated 24.0.0
*
* @param string $application application id
* @param string|null $file filename
* @param bool $prepend prepend the Script to the beginning of the list
@ -611,6 +613,8 @@ class OC_Util {
/**
* add a translation JS file
*
* @deprecated 24.0.0
*
* @param string $application application id
* @param string|null $languageCode language code, defaults to the current language
* @param bool|null $prepend prepend the Script to the beginning of the list

82
lib/public/Util.php
View file

@ -72,9 +72,12 @@ class Util {
*/
public const FATAL = 4;
/** \OCP\Share\IManager */
/** @var \OCP\Share\IManager */
private static $shareManager;
/** @var array */
private static $scripts = [];
/**
* get the current installed version of Nextcloud
* @return array
@ -173,10 +176,73 @@ class Util {
* add a javascript file
* @param string $application
* @param string $file
* @param string $afterAppId
* @since 4.0.0
*/
public static function addScript($application, $file = null) {
\OC_Util::addScript($application, $file);
public static function addScript($application, $file = null, $afterAppId = null) {
if (!empty($application)) {
$path = "$application/js/$file";
} else {
$path = "js/$file";
}
// Inject js translations if we load a script for
// a specific app that is not core, as those js files
// need separate handling
if ($application !== 'core'
&& $file !== null
&& strpos($file, 'l10n') === false) {
self::addTranslations($application);
}
// manage priorities if defined
// we store the data like this, then flatten everything
// [
// 'core' => [
// 'first' => [
// '/core/js/main.js',
// ],
// 'last' => [
// '/apps/viewer/js/viewer-main.js',
// ]
// ],
// 'viewer' => [
// 'first' => [
// '/apps/viewer/js/viewer-public.js',
// ],
// 'last' => [
// '/apps/files_pdfviewer/js/files_pdfviewer-main.js',
// ]
// ]
// ]
if (!empty($afterAppId)) {
// init afterAppId app array if it doesn't exists
if (!array_key_exists($afterAppId, self::$scripts)) {
self::$scripts[$afterAppId] = ['first' => [], 'last' => []];
}
self::$scripts[$afterAppId]['last'][] = $path;
} else {
// init app array if it doesn't exists
if (!array_key_exists($application, self::$scripts)) {
self::$scripts[$application] = ['first' => [], 'last' => []];
}
self::$scripts[$application]['first'][] = $path;
}
}
/**
* Return the list of scripts injected to the page
*/
public static function getScripts(): array {
// merging first and last data set
$mapFunc = function (array $scriptsArray): array {
return array_merge(...array_values($scriptsArray));
};
$appScripts = array_map($mapFunc, self::$scripts);
// sort core first
$scripts = array_merge(isset($appScripts['core']) ? $appScripts['core'] : [], ...array_values($appScripts));
// remove duplicates
return array_unique($scripts);
}
/**
@ -186,7 +252,15 @@ class Util {
* @since 8.0.0
*/
public static function addTranslations($application, $languageCode = null) {
\OC_Util::addTranslations($application, $languageCode);
if (is_null($languageCode)) {
$languageCode = \OC::$server->getL10NFactory()->findLanguage($application);
}
if (!empty($application)) {
$path = "$application/l10n/$languageCode";
} else {
$path = "l10n/$languageCode";
}
self::$scripts[$application]['first'][] = $path;
}
/**