Merge pull request #7601 from Tryforce/7600-fix-menubar-click

Fixed #7600 - menubar clicks would not properly reset state of menubar when autodisplay false
primefaces · May 10, 2019 · 5192e9b · 5192e9b
2 parents e5c9481 + f680d76
commit 5192e9b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/app/components/menubar/menubar.ts b/src/app/components/menubar/menubar.ts
@@ -65,7 +65,7 @@ export class MenubarSub implements OnDestroy {
                 return;
             }
 
-            this.activeItem = this.activeMenu ? (this.activeMenu.isEqualNode(item) && this.autoDisplay ? null : item) : item;
+            this.activeItem = this.activeMenu ? (this.activeMenu.isEqualNode(item) ? null : item) : item;
             let nextElement = <HTMLLIElement>item.children[0].nextElementSibling;
             if (nextElement) {
                 let sublist = <HTMLUListElement>nextElement.children[0];
@@ -85,7 +85,7 @@ export class MenubarSub implements OnDestroy {
 
             this.menuClick = true;
             this.menuHoverActive = this.activeMenu ? (!this.activeMenu.isEqualNode(item)) : true;
-            this.activeMenu = this.activeMenu ? (this.activeMenu.isEqualNode(item) && this.autoDisplay ? null: item) : item;
+            this.activeMenu = this.activeMenu ? (this.activeMenu.isEqualNode(item) ? null: item) : item;
             this.bindEventListener();
         }
     }