Merge pull request #93 from tyreepace/master

Search and go
Ember-SC · May 20, 2013 · c2e1be8 · c2e1be8
2 parents 0d1772b + 8a9e669
commit c2e1be8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 27 deletions.
diff --git a/app/assets/javascripts/app.js.coffee b/app/assets/javascripts/app.js.coffee
@@ -27,5 +27,5 @@ YJ.reopen(
     YJ.User.createRecord(name: name, email: email)
 )
 
-YJ.searchTerm = Em.Object.create(term: null)
+YJ.searchPhrase = ''
 
diff --git a/app/assets/javascripts/controllers/terms_index_controller.js.coffee b/app/assets/javascripts/controllers/terms_index_controller.js.coffee
@@ -9,6 +9,7 @@
 YJ.TermsIndexController = Ember.ArrayController.extend(
   # The place to hold the letter used to filter by the first letter
   searchLetter: null
+  searchPhrase: null
   content: []
   sortProperties: ['name']
   isDefined: null
@@ -27,16 +28,17 @@ YJ.TermsIndexController = Ember.ArrayController.extend(
   )
 
   filtered: (->
-    noSearch = @get('searchLetter') is null
+    noSearchLetter = @get('searchLetter') is null
     noDefined = @get('isDefined') is null
+    #noSearchPhrase = @get('searchPhrase') is null
     arranged = @get('arrangedContent')
     myself = @
     arranged.filter (item, index, arranged) ->
-      if noSearch && noDefined
+      if noSearchLetter && noDefined
         true
-      else if !noSearch && noDefined
+      else if !noSearchLetter && noDefined
         myself.filterSearchLetter(item)
-      else if noSearch && !noDefined
+      else if noSearchLetter && !noDefined
         myself.filterIsDefined(item)
       else
         myself.filterIsDefined(item) && myself.filterSearchLetter(item)
@@ -48,4 +50,6 @@ YJ.TermsIndexController = Ember.ArrayController.extend(
   filterIsDefined: (item) ->
      item.get('isDefined') == @get('isDefined')
 
+  computeSearchResults: ->
+    @set('content', YJ.Term.find({search: @get('searchPhrase')}))
 )
diff --git a/app/assets/javascripts/router.js.coffee b/app/assets/javascripts/router.js.coffee
@@ -3,8 +3,6 @@ YJ.Router.map ->
     path: "/"
   @resource 'terms', ->
     @route "index"
-    @route "search"
-      path: '/search/:search_term'
     @resource 'term'
       path: '/:term_id'
     , ->

diff --git a/app/assets/javascripts/routes/route.js.coffee b/app/assets/javascripts/routes/route.js.coffee
@@ -16,10 +16,12 @@ Ember.Route.reopen(
       #   else
       #     me.transitionTo('home')
 
-    toSearch: ((event) ->
-      searchTerm = YJ.get('searchTerm').term
-      console.log("Search is " + searchTerm)
-      @transitionTo('terms.search', searchTerm)
+    toSearch: ( ->
+      searchPhrase = YJ.get('searchPhrase')
+      console.log("Search is " + searchPhrase)
+      controller = @controllerFor('termsIndex')
+      controller.set('searchPhrase', searchPhrase)
+      controller.computeSearchResults()
     )
 
     alert: (alert) ->

diff --git a/app/assets/javascripts/routes/terms/terms_search_route.js.coffee b/app/assets/javascripts/routes/terms/terms_search_route.js.coffee
diff --git a/app/assets/javascripts/templates/navbar.handlebars b/app/assets/javascripts/templates/navbar.handlebars
@@ -4,7 +4,7 @@
       {{#linkTo terms class="brand"}} YourJargon {{/linkTo}}
 
       <form class="navbar-search pull-left">
-         {{view Ember.TextField valueBinding="YJ.searchTerm.term"}}
+         {{view Ember.TextField valueBinding="YJ.searchPhrase"}}
       </form>
 
       <ul class="nav pull-left">