[Pkg-owncloud-commits] [owncloud] 24/69: Close the user menu when clicking it again

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit d732a7b32f13aaa3aa38378799dd25a99f606f6a
Author: Joas Schilling <nickvergessen at owncloud.com>
Date:   Mon Nov 2 09:49:03 2015 +0100

    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 9439691..956fbec 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1312,7 +1312,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 3ebe553..f653fc8 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 4d9e3ae..15e4cc9 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']): ?>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git