aboutsummaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2019-05-06 17:48:53 +0200
committerGitHub <noreply@github.com>2019-05-06 17:48:53 +0200
commite0c62352b71441c2f843fd5f023000af342011a8 (patch)
treebc6a164f94d4b6684a0a631ec1ae3571328660b3 /core/src
parent16d696e94d23a2434a55c83c4b1d704475959a9f (diff)
parent42be4b7765a7a1b045a109bda0f3fbfc5d1bd097 (diff)
downloadnextcloud-server-e0c62352b71441c2f843fd5f023000af342011a8.tar.gz
nextcloud-server-e0c62352b71441c2f843fd5f023000af342011a8.zip
Move oc_appconfig/OC.appConfig to the main bundle (#15354)
Move oc_appconfig/OC.appConfig to the main bundle
Diffstat (limited to 'core/src')
-rw-r--r--core/src/OC/appconfig.js4
-rw-r--r--core/src/OC/index.js3
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/OC/appconfig.js b/core/src/OC/appconfig.js
index 6cc69231e41..ee7efb8a3ac 100644
--- a/core/src/OC/appconfig.js
+++ b/core/src/OC/appconfig.js
@@ -18,10 +18,10 @@
*
*/
-import OCP from '../OCP/index';
-
import {getValue, setValue, getApps, getKeys, deleteKey} from '../OCP/appconfig'
+export const appConfig = window.oc_appconfig || {}
+
/**
* @namespace
* @deprecated 16.0.0 Use OCP.AppConfig instead
diff --git a/core/src/OC/index.js b/core/src/OC/index.js
index ff7b3c2503d..f852ef1d309 100644
--- a/core/src/OC/index.js
+++ b/core/src/OC/index.js
@@ -20,7 +20,7 @@
*/
import Apps from './apps'
-import AppConfig from './appconfig'
+import {AppConfig, appConfig} from './appconfig'
import Backbone from './backbone'
import Config from './config'
import ContactsMenu from './contactsmenu'
@@ -49,6 +49,7 @@ import {redirect, reload} from './navigation'
export default {
Apps,
AppConfig,
+ appConfig,
Backbone,
ContactsMenu,
config: Config,