Move oc_appconfig/OC.appConfig to the main bundle

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

5 files changed, 11 insertions, 12 deletions

diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index 83a469dc1b6..970b278089d 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -97,7 +97,7 @@ OC.config = {
 	session_keepalive: false,
 	blacklist_files_regex: '\.(part|filepart)$',
 };
-window.oc_appconfig = {
+OC.appConfig = {
 	core: {}
 };
 window.oc_defaults = {
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index 2006f29bc01..acae9c13e56 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -19,7 +19,6 @@
 *
 */
 
-/* global oc_appconfig */
 describe('OC.Share tests', function() {
 	describe('markFileAsShared', function() {
 		var $file;
diff --git a/core/js/tests/specs/sharedialogshareelistview.js b/core/js/tests/specs/sharedialogshareelistview.js
index ff353404bcc..7f25825bf7a 100644
--- a/core/js/tests/specs/sharedialogshareelistview.js
+++ b/core/js/tests/specs/sharedialogshareelistview.js
@@ -19,7 +19,6 @@
  *
  */
 
-/* global oc_appconfig */
 describe('OC.Share.ShareDialogShareeListView', function () {
 
 	var oldCurrentUser;
@@ -31,8 +30,8 @@ describe('OC.Share.ShareDialogShareeListView', function () {
 
 	beforeEach(function () {
 		/* jshint camelcase:false */
-		oldAppConfig = _.extend({}, oc_appconfig.core);
-		oc_appconfig.core.enforcePasswordForPublicLink = false;
+		oldAppConfig = _.extend({}, OC.appConfig.core);
+		OC.appConfig.core.enforcePasswordForPublicLink = false;
 
 		fileInfoModel = new OCA.Files.FileInfoModel({
 			id: 123,
@@ -84,7 +83,7 @@ describe('OC.Share.ShareDialogShareeListView', function () {
 	afterEach(function () {
 		OC.currentUser = oldCurrentUser;
 		/* jshint camelcase:false */
-		oc_appconfig.core = oldAppConfig;
+		OC.appConfig.core = oldAppConfig;
 		listView.remove();
 		updateShareStub.restore();
 	});
diff --git a/core/js/tests/specs/sharedialogviewSpec.js b/core/js/tests/specs/sharedialogviewSpec.js
index 404e2fe494e..2be82181f4b 100644
--- a/core/js/tests/specs/sharedialogviewSpec.js
+++ b/core/js/tests/specs/sharedialogviewSpec.js
@@ -19,7 +19,7 @@
 *
 */
 
-/* global oc_appconfig, sinon */
+/* global sinon, OC */
 describe('OC.Share.ShareDialogView', function() {
 	var $container;
 	var oldConfig;
@@ -44,8 +44,8 @@ describe('OC.Share.ShareDialogView', function() {
 		oldConfig = OC.config;
 		OC.config['sharing.maxAutocompleteResults'] = 0;
 		/* jshint camelcase:false */
-		oldAppConfig = _.extend({}, oc_appconfig.core);
-		oc_appconfig.core.enforcePasswordForPublicLink = false;
+		oldAppConfig = _.extend({}, OC.appConfig.core);
+		OC.appConfig.core.enforcePasswordForPublicLink = false;
 
 		fetchStub = sinon.stub(OC.Share.ShareItemModel.prototype, 'fetch');
 		saveLinkShareStub = sinon.stub(OC.Share.ShareItemModel.prototype, 'saveLinkShare');
@@ -113,7 +113,7 @@ describe('OC.Share.ShareDialogView', function() {
 		OC.currentUser = oldCurrentUser;
 		OC.config = oldConfig;
 		/* jshint camelcase:false */
-		oc_appconfig.core = oldAppConfig;
+		OC.appConfig.core = oldAppConfig;
 
 		dialog.remove();
 		fetchStub.restore();
diff --git a/core/js/tests/specs/shareitemmodelSpec.js b/core/js/tests/specs/shareitemmodelSpec.js
index e8016950094..d08f23f0842 100644
--- a/core/js/tests/specs/shareitemmodelSpec.js
+++ b/core/js/tests/specs/shareitemmodelSpec.js
@@ -19,7 +19,8 @@
 *
 */
 
-/* global oc_appconfig */
+/* global OC */
+
 describe('OC.Share.ShareItemModel', function() {
 	var fetchSharesStub, fetchReshareStub;
 	var fetchSharesDeferred, fetchReshareDeferred;
@@ -492,7 +493,7 @@ describe('OC.Share.ShareItemModel', function() {
 	
 	describe('share permissions', function() {
 		beforeEach(function() {
-			oc_appconfig.core.resharingAllowed = true;
+			OC.appConfig.core.resharingAllowed = true;
 		});
 
 		/**