summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2019-05-03 08:42:42 +0200
committerChristoph Wurst <christoph@winzerhof-wurst.at>2019-05-06 13:36:23 +0200
commit42be4b7765a7a1b045a109bda0f3fbfc5d1bd097 (patch)
tree4b429305ddca0116719049c140145c91fc7f19c6 /core/src
parent7e6b8ca820dd4c4ff3fa99cff22bee30687582b4 (diff)
downloadnextcloud-server-42be4b7765a7a1b045a109bda0f3fbfc5d1bd097.tar.gz
nextcloud-server-42be4b7765a7a1b045a109bda0f3fbfc5d1bd097.zip
Move oc_appconfig/OC.appConfig to the main bundle
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
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,