From 70ef23d99a49f09b1a95ccde09b0590f94fca1cf Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 2 Feb 2016 19:46:55 +0100 Subject: [PATCH] Allow search terms with spaces. Fixed browser tests. --- app/assets/javascripts/app/lib/base/jquery.textmodule.js | 7 ++++--- test/browser/agent_ticket_actions_level0_test.rb | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/app/lib/base/jquery.textmodule.js b/app/assets/javascripts/app/lib/base/jquery.textmodule.js index 6836f47d2..21ea38609 100644 --- a/app/assets/javascripts/app/lib/base/jquery.textmodule.js +++ b/app/assets/javascripts/app/lib/base/jquery.textmodule.js @@ -237,6 +237,7 @@ } this.buffer = '' this.active = false + this.$widget.remove() $(window).off('click.textmodule') } @@ -367,7 +368,7 @@ this.log('result', term, result) if (!result[0]) { - return this.close() + result = [{id:'', name: '-'}] } if (!this.active) { @@ -382,7 +383,7 @@ element.attr('data-id', item.id) element.text(App.Utils.htmlEscape(item.name)) element.addClass('u-clickable u-textTruncate') - if (i == result.length-1) { + if (i == result.length-1 && item.id != '') { element.addClass('is-active') } if (item.keywords) { @@ -390,7 +391,7 @@ } elements = elements.add(element) } - + this.$widget.find('ul').append(elements).scrollTop(9999) this.movePosition() } diff --git a/test/browser/agent_ticket_actions_level0_test.rb b/test/browser/agent_ticket_actions_level0_test.rb index ed2e02351..2adff64a6 100644 --- a/test/browser/agent_ticket_actions_level0_test.rb +++ b/test/browser/agent_ticket_actions_level0_test.rb @@ -47,7 +47,7 @@ class AgentTicketActionLevel0Test < TestCase value: :arrow_down, slow: true, ) - click( css: '.active .shortcut > ul> li > a' ) + click( css: '.active .shortcut > ul> li' ) watch_for( css: '.active div[data-name=body]', @@ -134,7 +134,7 @@ class AgentTicketActionLevel0Test < TestCase ) click( browser: browser2, - css: '.active .shortcut > ul> li > a', + css: '.active .shortcut > ul> li', ) watch_for( @@ -161,7 +161,7 @@ class AgentTicketActionLevel0Test < TestCase ) click( browser: browser2, - css: '.active .shortcut > ul> li > a', + css: '.active .shortcut > ul> li', ) watch_for( browser: browser2, @@ -205,7 +205,7 @@ class AgentTicketActionLevel0Test < TestCase sleep 1 click( browser: browser2, - css: '.active .shortcut > ul> li > a', + css: '.active .shortcut > ul> li', ) watch_for(