aboutsummaryrefslogtreecommitdiffstats
path: root/core/js/js.js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-01-28 14:49:34 +0100
committerGitHub <noreply@github.com>2019-01-28 14:49:34 +0100
commitcfdece7833ed407cfee63b73c9ae20fde848ffc3 (patch)
tree810f617ea388ccf4cbf7be94ff54a7eb3af3b426 /core/js/js.js
parentb5b8a17222b33bcbfe677cf68a511f688dbd09dc (diff)
parent87bc9f1fa1fceccb248254030aaed16da5e6aed8 (diff)
downloadnextcloud-server-cfdece7833ed407cfee63b73c9ae20fde848ffc3.tar.gz
nextcloud-server-cfdece7833ed407cfee63b73c9ae20fde848ffc3.zip
Merge pull request #13860 from nextcloud/refactor/oc-oca-namespace-bundle
Add OC and OCA namespace declarations to the bundle
Diffstat (limited to 'core/js/js.js')
-rw-r--r--core/js/js.js19
1 files changed, 7 insertions, 12 deletions
diff --git a/core/js/js.js b/core/js/js.js
index fd6dcfcff6a..1aaee24af9b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -39,11 +39,12 @@ function escapeHTML(s) {
}
/** @namespace OCP */
-var OCP = Object.assign({}, window.OCP),
- /**
- * @namespace OC
- */
- OC = {
+var OCP = Object.assign({}, window.OCP);
+
+/**
+ * @namespace OC
+ */
+Object.assign(window.OC, {
PERMISSION_NONE:0,
PERMISSION_CREATE:4,
PERMISSION_READ:1,
@@ -900,7 +901,7 @@ var OCP = Object.assign({}, window.OCP),
}
}
-};
+});
/**
* Current user attributes
@@ -2339,12 +2340,6 @@ OC.set=function(name, value) {
})();
/**
- * Namespace for apps
- * @namespace OCA
- */
-window.OCA = {};
-
-/**
* select a range in an input field
* @link http://stackoverflow.com/questions/499126/jquery-set-cursor-position-in-text-area
* @param {type} start