From 6486b0b4f8eb337399b8ef0c23f54e9fefe68ff6 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 3 Dec 2018 16:17:50 +0200 Subject: [PATCH] fix global search button --- client/src/views/global-search/global-search.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/client/src/views/global-search/global-search.js b/client/src/views/global-search/global-search.js index 76cd9dca0d..d34dc21687 100644 --- a/client/src/views/global-search/global-search.js +++ b/client/src/views/global-search/global-search.js @@ -47,7 +47,6 @@ Espo.define('views/global-search/global-search', 'view', function (Dep) { }, setup: function () { - this.wait(true); this.getCollectionFactory().create('GlobalSearch', function (collection) { this.collection = collection; @@ -61,7 +60,7 @@ Espo.define('views/global-search/global-search', 'view', function (Dep) { this.$input = this.$el.find('#global-search-input'); }, - runSearch: function (text) { + runSearch: function () { var text = this.$input.val().trim(); if (text != '' && text.length >= 2) { text = text; @@ -97,7 +96,11 @@ Espo.define('views/global-search/global-search', 'view', function (Dep) { } }.bind(this)); $document.on('click.global-search', function (e) { - if (e.target.tagName == 'A' && $(e.target).data('action') != 'showMore') { + if ( + e.target.tagName == 'A' && + $(e.target).data('action') != 'showMore' && + !$(e.target).hasClass('global-search-button') + ) { setTimeout(function () { this.closePanel(); }.bind(this), 100);