From f04151f69bccae0e0702b433e68e7936db3f9172 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Mon, 2 Nov 2015 09:49:03 +0100
Subject: [PATCH] Close the user menu when clicking it again
---
core/js/js.js | 2 +-
core/js/tests/specs/coreSpec.js | 3 +--
core/templates/layout.user.php | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/js/js.js b/core/js/js.js
index a3efb64e4b..460f65256a 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1295,7 +1295,7 @@ function initCore() {
*/
function setupMainMenu() {
// toggle the navigation
- var $toggle = $('#header .menutoggle');
+ var $toggle = $('#header .header-appname-container');
var $navigation = $('#navigation');
// init the menu
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 3ebe55305f..f653fc8863 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -458,12 +458,11 @@ describe('Core base tests', function() {
var clock;
var $toggle;
var $navigation;
- var clock;
beforeEach(function() {
clock = sinon.useFakeTimers();
$('#testArea').append('<div id="header">' +
- '<a class="menutoggle" href="#">' +
+ '<a class="menutoggle header-appname-container" href="#">' +
'<h1 class="header-appname"></h1>' +
'<div class="icon-caret"></div>' +
'</a>' +
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 4d9e3ae93d..15e4cc9986 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -63,7 +63,7 @@
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div id="settings" class="svg">
- <div id="expand" tabindex="6" role="link">
+ <div id="expand" tabindex="6" role="link" class="menutoggle">
<?php if ($_['enableAvatars']): ?>
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
<?php if ($_['userAvatarSet']): ?>
--
GitLab