wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20215 from owncloud/issue-20178-close-user-menu-on-reclick

Browse source 
Close the user menu when clicking it again
This commit is contained in:
Thomas Müller 2015-11-02 11:27:29 +01:00
commit be5552981a
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/js.js
View file

@ -1295,7 +1295,7 @@ function initCore() {
*/ */
function setupMainMenu() { function setupMainMenu() {
// toggle the navigation // toggle the navigation
var $toggle = $('#header .menutoggle'); var $toggle = $('#header .header-appname-container');
var $navigation = $('#navigation'); var $navigation = $('#navigation');
// init the menu // init the menu

3
core/js/tests/specs/coreSpec.js
View file

@ -458,12 +458,11 @@ describe('Core base tests', function() {
var clock; var clock;
var $toggle; var $toggle;
var $navigation; var $navigation;
var clock;
beforeEach(function() { beforeEach(function() {
clock = sinon.useFakeTimers(); clock = sinon.useFakeTimers();
$('#testArea').append('<div id="header">' + $('#testArea').append('<div id="header">' +
'<a class="menutoggle" href="#">' + '<a class="menutoggle header-appname-container" href="#">' +
'<h1 class="header-appname"></h1>' + '<h1 class="header-appname"></h1>' +
'<div class="icon-caret"></div>' + '<div class="icon-caret"></div>' +
'</a>' + '</a>' +

2
core/templates/layout.user.php
View file

@ -63,7 +63,7 @@
<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
<div id="settings" class="svg"> <div id="settings" class="svg">
<div id="expand" tabindex="6" role="link"> <div id="expand" tabindex="6" role="link" class="menutoggle">
<?php if ($_['enableAvatars']): ?> <?php if ($_['enableAvatars']): ?>
<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>"> <div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
<?php if ($_['userAvatarSet']): ?> <?php if ($_['userAvatarSet']): ?>