fix #1 and clean things up a bit

rmurphey · Apr 13, 2012 · 9d1a49a · 9d1a49a
1 parent 970a9b6
commit 9d1a49a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 16 deletions.
diff --git a/app/components/results.js b/app/components/results.js
@@ -23,6 +23,13 @@ define([
       this.itemTpl = _.template(itemTpl);
     },
 
+    reset : function() {
+      this._filter(
+        { currentTarget : this.query('.js-all-filter') },
+        ''
+      );
+    },
+
     _filter : function(evt, type) {
       $(evt.currentTarget).addClass('active').siblings().removeClass('active');
       if (type) {

diff --git a/app/components/searchForm.js b/app/components/searchForm.js
@@ -10,7 +10,7 @@ define([ 'app/components/base', 'text!app/templates/searchForm.html' ], function
       e.preventDefault();
       var term = $.trim(this.query('.js-input').val());
       if (!term) { return; }
-      this.trigger('search', term);
+      this.currentSearch.set('term', term);
     }
   });
 });
diff --git a/app/controllers/search.js b/app/controllers/search.js
@@ -1,32 +1,32 @@
 define([
   'models/app',
-  'data/search',
   'components/results',
   'components/searchForm',
   'components/recentSearches'
-], function(app, SearchData, ResultsComponent, SearchFormComponent, RecentSearchesComponent) {
+], function(app, ResultsComponent, SearchFormComponent, RecentSearchesComponent) {
   return function(term) {
     var mainbar =   $('#mainbar').empty(),
         sidebar =   $('#sidebar').empty(),
 
-        sf =        new SearchFormComponent().render().placeAt(mainbar),
+        sf =        new SearchFormComponent({
+                      currentSearch : app.currentSearch
+                    }).render().placeAt(mainbar),
 
         results =   new ResultsComponent({
-                      searchData : SearchData
+                      searchData : app.searchData
                     }).render().placeAt(mainbar),
 
         recent =    new RecentSearchesComponent({
                       searches : app.searches,
                       currentSearch : app.currentSearch
                     }).render().placeAt(sidebar);
 
-    sf.on('search', function(term) {
-      window.Router.navigate('/search/' + term, true);
-    });
-
     app.currentSearch.on('change', function(s) {
-      SearchData.term = s.get('term');
+      var term = s.get('term');
-      SearchData.fetch();
+      window.Router.navigate('/search/' + term, true);
+      app.searchData.term = s.get('term');
+      app.searchData.fetch();
+      results.reset();
     });
 
     update(term);

diff --git a/app/data/search.js b/app/data/search.js
@@ -1,10 +1,9 @@
 define([
   'use!backbone'
 ], function(B) {
-  var SearchResults = B.Collection.extend({
+  var SearchData = B.Collection.extend({
     fetch : function() {
       var fetch = _.bind(B.Collection.prototype.fetch, this);
-
       fetch().then(_.bind(this.trigger, this, 'change'));
     },
 
@@ -13,5 +12,5 @@ define([
     }
   });
 
-  return new SearchResults();
+  return SearchData;
 });
diff --git a/app/models/app.js b/app/models/app.js
@@ -1,6 +1,7 @@
 define([
-  'use!backbone'
+  'use!backbone',
-], function(B) {
+  'data/search'
+], function(B, SearchData) {
   var Search = B.Model.extend({
     idAttribute : 'term'
   });
@@ -20,6 +21,7 @@ define([
 
   return {
     searches : searches,
+    searchData : new SearchData(),
     currentSearch : new Backbone.Model({ term : null })
   };
 });