Clicking the magnifying glass should perform search
In forum search is only working when user enter some text in the search textfield and press the Enter button. It should also work when we click on magnifying glass. TNL-526
This commit is contained in:
@@ -16,6 +16,7 @@ describe "DiscussionThreadListView", ->
|
|||||||
<label>
|
<label>
|
||||||
<span class="sr">Search</span>
|
<span class="sr">Search</span>
|
||||||
<input class="forum-nav-search-input" type="text" placeholder="Search all posts">
|
<input class="forum-nav-search-input" type="text" placeholder="Search all posts">
|
||||||
|
<i class="icon icon-search"></i>
|
||||||
</label>
|
</label>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@@ -331,6 +332,20 @@ describe "DiscussionThreadListView", ->
|
|||||||
@view.collection.trigger("change", new Thread({id: 1}))
|
@view.collection.trigger("change", new Thread({id: 1}))
|
||||||
expect(@view.clearSearchAlerts).toHaveBeenCalled()
|
expect(@view.clearSearchAlerts).toHaveBeenCalled()
|
||||||
|
|
||||||
|
describe "Search events", ->
|
||||||
|
|
||||||
|
it "perform search when enter pressed inside search textfield", ->
|
||||||
|
setupAjax()
|
||||||
|
spyOn(@view, "searchFor")
|
||||||
|
@view.$el.find(".forum-nav-search-input").trigger($.Event("keydown", {which: 13}))
|
||||||
|
expect(@view.searchFor).toHaveBeenCalled()
|
||||||
|
|
||||||
|
it "perform search when search icon is clicked", ->
|
||||||
|
setupAjax()
|
||||||
|
spyOn(@view, "searchFor")
|
||||||
|
@view.$el.find(".icon-search").click()
|
||||||
|
expect(@view.searchFor).toHaveBeenCalled()
|
||||||
|
|
||||||
describe "username search", ->
|
describe "username search", ->
|
||||||
|
|
||||||
it "makes correct ajax calls", ->
|
it "makes correct ajax calls", ->
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ if Backbone?
|
|||||||
"click .forum-nav-browse-menu-wrapper": "ignoreClick"
|
"click .forum-nav-browse-menu-wrapper": "ignoreClick"
|
||||||
"click .forum-nav-browse-title": "selectTopicHandler"
|
"click .forum-nav-browse-title": "selectTopicHandler"
|
||||||
"keydown .forum-nav-search-input": "performSearch"
|
"keydown .forum-nav-search-input": "performSearch"
|
||||||
|
"click .icon-search": "performSearch"
|
||||||
"change .forum-nav-sort-control": "sortThreads"
|
"change .forum-nav-sort-control": "sortThreads"
|
||||||
"click .forum-nav-thread-link": "threadSelected"
|
"click .forum-nav-thread-link": "threadSelected"
|
||||||
"click .forum-nav-load-more-link": "loadMorePages"
|
"click .forum-nav-load-more-link": "loadMorePages"
|
||||||
@@ -425,7 +426,8 @@ if Backbone?
|
|||||||
@retrieveFirstPage(event)
|
@retrieveFirstPage(event)
|
||||||
|
|
||||||
performSearch: (event) ->
|
performSearch: (event) ->
|
||||||
if event.which == 13
|
#event.which 13 represent the Enter button
|
||||||
|
if event.which == 13 or event.type == 'click'
|
||||||
event.preventDefault()
|
event.preventDefault()
|
||||||
@hideBrowseMenu()
|
@hideBrowseMenu()
|
||||||
@setCurrentTopicDisplay(gettext("Search Results"))
|
@setCurrentTopicDisplay(gettext("Search Results"))
|
||||||
|
|||||||
Reference in New Issue
Block a user