Ver código fonte

Auto-close topnav menu when fast-navigating

Vijayakrishnan Krishnan 4 anos atrás
pai
commit
78b2daf5bd
3 arquivos alterados com 9 adições e 8 exclusões
  1. 4 6
      public/js/mc.js
  2. 3 0
      public/js/yemi.js
  3. 2 2
      resources/views/layouts/template.blade.php

+ 4 - 6
public/js/mc.js

@@ -167,11 +167,9 @@ function initFastLoad(_parent = false) {
                 showMask();
                 console.log('ALIX: showed mask');
                 fastLoad(this.href, true, true);
-                if (_menuItem) {
-                    $(this).closest('.dropdown-menu')
-                        .removeClass('show')
-                        .prev('.dropdown-toggle').attr('aria-expanded', 'false');
-                }
+                $('.dropdown-menu[aria-labelledby="practice-management"]')
+                    .removeClass('show')
+                    .prev('.dropdown-toggle').attr('aria-expanded', 'false');
                 return false;
             });
         // console.info('FastLoad enabled for ' + _a.innerText + ' [' + _a.href + ']');
@@ -194,7 +192,7 @@ function onFastLoaded(_data, _href, _history) {
     var content = $(_data).find('.stag-content');
     if (content && content.length) {
         content = content.html();
-        content += '<script src="/js/yemi.js?_=2"></script>';
+        content += '<script src="/js/yemi.js?_=3"></script>';
         targetParent.html(content);
         window.setTimeout(function() {
             initPrimaryForm();

+ 3 - 0
public/js/yemi.js

@@ -280,6 +280,9 @@ jQuery(document).ready(function () {
 
         if (start) {
             $(start).click(function () {
+                $('.dropdown-menu[aria-labelledby="practice-management"]')
+                    .removeClass('show')
+                    .prev('.dropdown-toggle').attr('aria-expanded', 'false');
                 if ($(realForm).attr('show') == null) {
                     if (!formToggle && $(realForm).attr('liner') != null) {
                         $(realForm).css('display', 'inline');

+ 2 - 2
resources/views/layouts/template.blade.php

@@ -24,7 +24,7 @@
     <script src="https://code.jquery.com/jquery-3.5.1.min.js" integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
     <script src="{{ asset('fullcalendar/main.min.js') }}" type="application/javascript"></script>
     <script src="{{ asset('js/toastr.min.js') }}" type="application/javascript"></script>
-    <script src="/js/yemi.js?_=2" type="application/javascript"></script>
+    <script src="/js/yemi.js?_=3" type="application/javascript"></script>
 
     @yield('head')
 </head>
@@ -82,7 +82,7 @@
     </main><!-- /.container -->
 
     <!-- script to handle history & back/forward for mc/xxx pages -->
-    <script src="/js/mc.js?_=2" type="application/javascript"></script>
+    <script src="/js/mc.js?_=3" type="application/javascript"></script>
 
 </body>