From 280f52f007f00e0a8b2c910445bb54dfbf7275a0 Mon Sep 17 00:00:00 2001
From: git-marijus <mario@mariovavti.com>
Date: Sat, 29 Jul 2017 16:06:42 +0200
Subject: close the apps-menu if the notifications-menu is open and vice versa

---
 view/js/main.js                    |  2 +-
 view/theme/redbasic/js/redbasic.js | 12 ++++++++++++
 view/tpl/nav.tpl                   |  2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/js/main.js b/view/js/main.js
index 6c42531ea..61a37aa99 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -375,7 +375,7 @@ function NavUpdate() {
 			}
 			else {
 				$('#notifications-btn').css('opacity', 0.5);
-				$('#navbar-collapse-1').removeClass('in');
+				$('#navbar-collapse-1').removeClass('show');
 			}
 
 			if(data.network == 0) {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index a4fee495c..5a586b9f9 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -54,6 +54,18 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#menu-btn').click(function() {
+		if($('#navbar-collapse-1').hasClass('show')){
+			$('#navbar-collapse-1').removeClass('show');
+		}
+	});
+
+	$('#notifications-btn').click(function() {
+		if($('#navbar-collapse-2').hasClass('show')){
+			$('#navbar-collapse-2').removeClass('show');
+		}
+	});
+
 	$("input[data-role=cat-tagsinput]").tagsinput({
 		tagClass: 'badge badge-pill badge-warning text-dark'
 	});
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index b9abf4d48..f480ce994 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -68,7 +68,7 @@
 		<i class="fa fa-exclamation-circle"></i>
 	</button>
 	{{/if}}
-	<button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
 		<i class="fa fa-bars"></i>
 	</button>
 </div>
-- 
cgit v1.2.3