diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2019-05-02 09:32:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 09:32:38 +0200 |
| commit | ac700506bd9d502a97fbee8635535dc03ce6eb92 (patch) | |
| tree | e752bd3599238aa42fbba9f45e0ba9b8b12c6c19 /core/js/js.js | |
| parent | 579588a4cd430f785e30e627c2d8d12131bce4f6 (diff) | |
| parent | e7a190179f09f14f6eddea0946721a7d0cf34302 (diff) | |
| download | nextcloud-server-ac700506bd9d502a97fbee8635535dc03ce6eb92.tar.gz nextcloud-server-ac700506bd9d502a97fbee8635535dc03ce6eb92.zip | |
Merge pull request #15338 from nextcloud/refactor/oc-config-usage
Change oc_config usage to OC.config
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/js/js.js b/core/js/js.js index 084a7fbd34e..f5d7ac4561a 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -141,7 +141,7 @@ Object.assign(window.OC, { } - if(oc_config.modRewriteWorking == true) { + if(OC.config.modRewriteWorking == true) { return OC.getRootPath() + _build(url, params); } @@ -203,7 +203,7 @@ Object.assign(window.OC, { * @param {string} file to check */ fileIsBlacklisted: function(file) { - return !!(file.match(oc_config.blacklist_files_regex)); + return !!(file.match(OC.config.blacklist_files_regex)); }, /** @@ -935,8 +935,8 @@ function initCore() { function initSessionHeartBeat() { // interval in seconds var interval = NaN; - if (oc_config.session_lifetime) { - interval = Math.floor(oc_config.session_lifetime / 2); + if (OC.config.session_lifetime) { + interval = Math.floor(OC.config.session_lifetime / 2); } interval = isNaN(interval)? 900: interval; @@ -957,8 +957,8 @@ function initCore() { } // session heartbeat (defaults to enabled) - if (typeof(oc_config.session_keepalive) === 'undefined' || - !!oc_config.session_keepalive) { + if (typeof(OC.config.session_keepalive) === 'undefined' || + !!OC.config.session_keepalive) { initSessionHeartBeat(); } |