aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-07-29 16:06:42 +0200
committergit-marijus <mario@mariovavti.com>2017-07-31 02:52:36 +0200
commit280f52f007f00e0a8b2c910445bb54dfbf7275a0 (patch)
treea71dca8ca49cee04590208f5751961ea99dfc39a
parent11cdd0033d7cff690a9df75d8b5a3b8a29f8098b (diff)
downloadvolse-hubzilla-280f52f007f00e0a8b2c910445bb54dfbf7275a0.tar.gz
volse-hubzilla-280f52f007f00e0a8b2c910445bb54dfbf7275a0.tar.bz2
volse-hubzilla-280f52f007f00e0a8b2c910445bb54dfbf7275a0.zip
close the apps-menu if the notifications-menu is open and vice versa
-rw-r--r--view/js/main.js2
-rw-r--r--view/theme/redbasic/js/redbasic.js12
-rwxr-xr-xview/tpl/nav.tpl2
3 files changed, 14 insertions, 2 deletions
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>