summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2019-04-10 21:41:25 +0200
committerGitHub <noreply@github.com>2019-04-10 21:41:25 +0200
commit47226a19cc5f39e74902a5702c9d295b85054cf5 (patch)
tree2cbadbdbe936c917acd659e8a2c866ce61075552 /core
parentad82c26e8c5cb7f5f45eab22ac1d5900c28bbb53 (diff)
parent0871b9acfffc3b039131cac9b2168a6558982377 (diff)
downloadnextcloud-server-47226a19cc5f39e74902a5702c9d295b85054cf5.tar.gz
nextcloud-server-47226a19cc5f39e74902a5702c9d295b85054cf5.zip
Merge pull request #14972 from nextcloud/fix/app-nav-toggle-missing
Disable the injected snapper logic when apps want to ship their own
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js
index e03e2334c09..5e8532883b4 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1192,7 +1192,9 @@ function initCore() {
setTimeout(resizeMenu, 0);
// just add snapper for logged in users
- if($('#app-navigation').length && !$('html').hasClass('lte9')) {
+ // and if the app doesn't handle the nav slider itself
+ if($('#app-navigation').length && !$('html').hasClass('lte9')
+ && !$('#app-content').hasClass('no-snapper')) {
// App sidebar on mobile
var snapper = new Snap({