From b2b7fa485462cb460a19f0dfefbb4d7f87c841e6 Mon Sep 17 00:00:00 2001
From: Thomas Pulzer <t.pulzer@kniel.de>
Date: Thu, 11 Aug 2016 07:22:13 +0200
Subject: Fixed user and main menu closing on right mouse button click. Fixed
 wrong variable assignment when trying to open link in new window.

---
 core/js/js.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'core/js/js.js')

diff --git a/core/js/js.js b/core/js/js.js
index f2301928a31..2231ba73889 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1509,12 +1509,13 @@ function initCore() {
 			if(event.which === 1 && !event.ctrlKey && !event.metaKey) {
 				$app.addClass('app-loading');
 			} else {
-				// Close navigation when opening app in
-				// a new tab
-				OC.hideMenus();
 				// On middle click or on first button click with ctrl key or meta key hold
+				console.log(event.which);
 				if(event.which === 2 || (event.which === 1 && (event.ctrlKey || event.metaKey))) {
-					window.open($page, '_blank');
+					// Close navigation when opening app in
+					// a new tab
+					OC.hideMenus();
+					window.open($app, '_blank');
 				}
 			}
 		});
@@ -1534,11 +1535,11 @@ function initCore() {
 				$page.find('div').remove(); // prevent odd double-clicks
 				$page.prepend($('<div/>').addClass('icon-loading-small-dark'));
 			} else {
-				// Close navigation when opening menu entry in
-				// a new tab
-				OC.hideMenus();
 				// On middle click or on first button click with ctrl key or meta key hold
 				if(event.which === 2 || (event.which === 1 && (event.ctrlKey || event.metaKey))) {
+					// Close navigation when opening menu entry in
+					// a new tab
+					OC.hideMenus();
 					window.open($page, '_blank');
 				}
 			}
-- 
cgit v1.2.3