use view options instead of custom mixin

rmurphey · May 28, 2012 · 5d67e8a · 5d67e8a
1 parent 0e7e565
commit 5d67e8a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 31 deletions.
diff --git a/app/views/base.js b/app/views/base.js
@@ -10,11 +10,6 @@ define([
 
     initialize : function(config) {
       _.bindAll(this, 'bindTo', 'unbind');
-
-      if (config) {
-        _.extend(this, config);
-      }
-
       this._bindings = [];
       this.prepare();
     },
@@ -91,4 +86,3 @@ define([
 
   return View;
 });
-
diff --git a/app/views/recentSearches.js b/app/views/recentSearches.js
@@ -5,26 +5,27 @@ define([
   'text!views/templates/recentSearch.html'
 ], function(_, View, tpl, itemTpl) {
   return View.extend({
+    options : { },
     template : tpl,
     itemTpl : _.template(itemTpl),
 
     prepare : function() {
-      if (!_.isFunction(this.currentSearch)) {
+      if (!_.isFunction(this.options.currentSearch)) {
         throw new Error('Recent searches component needs a currentSearch function');
       }
-      this.bindTo(this.searches, 'add remove change', this._update);
+      this.bindTo(this.options.searches, 'add remove change', this._update);
     },
 
     postRender : function() {
       this._update();
     },
 
     _update : function() {
-      this.searches.sort();
+      this.options.searches.sort();
 
       var tpl = this.itemTpl,
-          currentSearch = this.currentSearch(),
-          html = this.searches.map(function(item) {
+          currentSearch = this.options.currentSearch(),
+          html = this.options.searches.map(function(item) {
             var data = item.toJSON();
 
             if (data.term) {

diff --git a/app/views/results.js b/app/views/results.js
@@ -4,6 +4,7 @@ define([
   'text!views/templates/result.html'
 ], function(View, tpl, itemTpl) {
   return View.extend({
+    options : { },
     template : tpl,
 
     elements : [ 'results' ],
@@ -24,8 +25,8 @@ define([
     },
 
     prepare : function() {
-      this.bindTo(this.searchData, 'add change', this._update);
-      this.bindTo(this.searchData, 'fetching', function() {
+      this.bindTo(this.options.searchData, 'add change', this._update);
+      this.bindTo(this.options.searchData, 'fetching', function() {
         this._empty();
         this.reset();
       });
@@ -62,12 +63,12 @@ define([
     _update : function() {
       var tpl = this.itemTpl,
           counts = {
-            all : this.searchData.length,
+            all : this.options.searchData.length,
             video : 0,
             image : 0,
             twitter : 0
           },
-          html = this.searchData.map(function(item) {
+          html = this.options.searchData.map(function(item) {
             var type = item.get('type'),
                 data = item.toJSON();
             counts[type] += 1;

diff --git a/tests/app/views/base.js b/tests/app/views/base.js
@@ -17,19 +17,14 @@ define([
     });
 
     describe("#initialize", function() {
-      it("should ingest a config object", function() {
-        var V = View.extend({ foo : 'bar' });
-        c = new V();
-        expect(c.foo).to.be('bar');
-      });
-
       it("should run the prepare method", function() {
         var flag = false;
-        c = new View({
+        var V = View.extend({
           prepare : function() {
             flag = true;
           }
         });
+        c = new V();
 
         expect(flag).to.be(true);
       });
@@ -55,13 +50,6 @@ define([
         expect(ret).to.be(c);
       });
 
-      it("should trigger a render event", function() {
-        var flag;
-        c.on('render', function() { flag = true; });
-        c.render();
-        expect(flag).to.be(true);
-      });
-
       it("should call the postRender method", function() {
         var flag = false,
             V = View.extend({

diff --git a/tests/app/views/recentSearches.js b/tests/app/views/recentSearches.js
@@ -43,8 +43,8 @@ define([
 
     it("should update when there is a new search", function() {
       expect(el.html()).not.to.contain('baz');
-      rs.currentSearch = function() { return 'baz'; };
-      rs.searches.add({ term : 'baz' });
+      rs.options.currentSearch = function() { return 'baz'; };
+      searches.add({ term : 'baz' });
       expect(el.html()).to.contain('baz');
       expect(el.find('.active').html()).to.contain('baz');
     });