post 1.3 fixes (#1106)

2019-09-17 22:20:36 +02:00
parent 13f5e76015
commit 24cbe3d281
12 changed files with 200 additions and 61 deletions
--- a/assets/js/plugins/KimaiToolbar.js
+++ b/assets/js/plugins/KimaiToolbar.js
@@ -225,7 +225,10 @@ export default class KimaiToolbar extends KimaiPlugin {
    }
    
    hide() {
-        jQuery(this.getSelector() + ' .dropdown-toggle').dropdown('toggle');
+        const toggle = jQuery(this.getSelector() + ' #searchTerm.dropdown-toggle');
+        if (toggle.parent().hasClass('open')) {
+            toggle.dropdown('toggle');
+        }
    }

    /**