taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing search

stable
Alejandro Alonso 2014-08-14 09:54:43 +02:00
parent c70a96cb22
commit 8321506d49
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/coffee/modules/search.coffee
View File

@ -102,7 +102,7 @@ module.controller("SearchController", SearchController)
## Search box directive ## Search box directive
############################################################################# #############################################################################
SearchBoxDirective = ($lightboxService, $navurls, $location)-> SearchBoxDirective = ($lightboxService, $navurls, $location, $route)->
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
project = null project = null
@ -120,10 +120,12 @@ SearchBoxDirective = ($lightboxService, $navurls, $location)->
$scope.$apply -> $scope.$apply ->
$location.path(url) $location.path(url)
$location.search("text",text).path(url) $location.search("text",text).path(url)
$route.reload()
$scope.$on "search-box:show", (ctx, newProject)-> $scope.$on "search-box:show", (ctx, newProject)->
project = newProject project = newProject
$lightboxService.open($el) $lightboxService.open($el)
$el.find("#search-text").val("")
$el.on "submit", (event) -> $el.on "submit", (event) ->
submit() submit()
@ -135,7 +137,7 @@ SearchBoxDirective = ($lightboxService, $navurls, $location)->
return {link:link} return {link:link}
module.directive("tgSearchBox", ["lightboxService", "$tgNavUrls", "$tgLocation", SearchBoxDirective]) module.directive("tgSearchBox", ["lightboxService", "$tgNavUrls", "$tgLocation", "$route", SearchBoxDirective])
############################################################################# #############################################################################
@ -205,7 +207,7 @@ SearchDirective = ($log, $compile, $templatecache, $routeparams, $location) ->
markSectionTabActive(activeSection) markSectionTabActive(activeSection)
$scope.$watch "searchTerm", (searchTerm) -> $scope.$watch "searchTerm", (searchTerm) ->
$location.search("text", searchTerm) if searchTerm? $location.search("text", searchTerm) if searchTerm
$el.on "click", ".search-filter li > a", (event) -> $el.on "click", ".search-filter li > a", (event) ->
event.preventDefault() event.preventDefault()
@ -228,8 +230,9 @@ SearchDirective = ($log, $compile, $templatecache, $routeparams, $location) ->
# linkFilters($scope, $el, $attrs, $ctrl) # linkFilters($scope, $el, $attrs, $ctrl)
linkTable($scope, $el, $attrs, $ctrl) linkTable($scope, $el, $attrs, $ctrl)
searchText = $routeparams.text
$scope.$watch "projectId", (projectId) -> $scope.$watch "projectId", (projectId) ->
$scope.searchTerm = $routeparams.text if projectId? $scope.searchTerm = searchText if projectId?
return {link:link} return {link:link}