diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2021-11-30 15:46:09 +0100 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2021-12-02 20:00:46 +0100 |
| commit | 71a3528510f0ef6e640fae79b9e30f0e639b716e (patch) | |
| tree | bcdb3a8feec838ce734b0bc701c9e8671bc4707f /lib/private | |
| parent | 6b3c7037946bf63b5bd684c7f1ee3e72ea0e6148 (diff) | |
| download | nextcloud-server-71a3528510f0ef6e640fae79b9e30f0e639b716e.tar.gz nextcloud-server-71a3528510f0ef6e640fae79b9e30f0e639b716e.zip | |
Allow scripts prioritization based on other apps
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/TemplateLayout.php | 4 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 639e7dc007b..317862ff386 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -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) diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 6239583160b..80114a60b89 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -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 |