Merge branch 'section_10_4' into section_10_5

noelrappin · Nov 25, 2012 · 81eecd6 · 81eecd6
2 parents 134be37 + 293bd40
commit 81eecd6
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/assets/javascripts/backbone/routers/tripRouter.js b/app/assets/javascripts/backbone/routers/tripRouter.js
@@ -2,7 +2,7 @@ TimeTravel.Routers.TripRouter = Backbone.Router.extend({
   //##routes
   routes: {
     "": "index",
-    "trips/:id": "tripDetail",
+    "trips/detail/:id": "tripDetail",
   },
   //##routes
 

diff --git a/app/assets/javascripts/backbone/templates/tripViewTemplate.mustache b/app/assets/javascripts/backbone/templates/tripViewTemplate.mustache
@@ -1,7 +1,5 @@
 <div class="trip_header">
-  <a href="/trips/{{id}}"
-     class="detail_page_link"
-     id="detail_page_link_{{id}}">{{name}}</a>
+  <a href="/trips/detail/{{id}}" class="detail_page_link">{{name}}</a>
 </div>
 <div class="trip_tag">{{tag_line}}</div>
 <div class="trip_dates">{{startDateDisplay}} - {{endDateDisplay}}</div>

diff --git a/app/assets/javascripts/backbone/views/tripView.js b/app/assets/javascripts/backbone/views/tripView.js
@@ -30,7 +30,7 @@ TimeTravel.Views.TripView = Backbone.View.extend({
   //##go
   goToDetailPage: function(event) {
     event.preventDefault();
-    TimeTravel.app.navigate("trips/" + this.model.get("id"), true);
+    TimeTravel.app.navigate("trips/detail/" + this.model.get("id"), true);
   },
   //##go
 

diff --git a/app/assets/javascripts/backbone/views/tripsView.js b/app/assets/javascripts/backbone/views/tripsView.js
@@ -7,6 +7,7 @@ TimeTravel.Views.TripsView = Backbone.View.extend({
     this.collection.bind('reset', this.render, this);
   },
 
+  //##renderWith
   render: function() {
     this.$el.html(TimeTravel.template('tripsViewTemplate').render());
     var $trips = this.$('.trips');

diff --git a/config/routes.rb b/config/routes.rb
@@ -18,6 +18,7 @@
   resources :users
 
   root :to => 'home#index'
+  match "trips/detail/:id" => 'home#index'
 
   #START: code.index_route
   match 'index' => 'home#index'

diff --git a/spec/javascripts/homePageSpec.js b/spec/javascripts/homePageSpec.js
@@ -35,7 +35,7 @@ describe("rendering the home page with Backbone", function() {
       spyOn(TimeTravel.app, 'navigate');
       TimeTravel.app.index();
       $("#detail_page_link_13").click();
-      expect(TimeTravel.app.navigate).toHaveBeenCalledWith('trips/13', true);
+      expect(TimeTravel.app.navigate).toHaveBeenCalledWith('trips/detail/13', true);
     });
 
   });