Browse files

Merge branch 'section_6_2' into section_6_3

  • Loading branch information...
2 parents e1f4741 + e0aa4a3 commit b7ee00f1dca6070e1be60160462124ca054fde0a Noel Rappin committed Aug 17, 2012
Showing with 2 additions and 2 deletions.
  1. +1 −1 app/assets/javascripts/application.js
  2. +1 −1 app/assets/javascripts/toggler.js
View
2 app/assets/javascripts/application.js
@@ -9,7 +9,7 @@
//= require jquery-ui
//= require_tree .
-activityData = {1: "Hiking", 2: "Changing History",
+activityData = {1: "Hiking", 2: "Changing History",
3: "Baseball", 4: "Programming"}
$(function() {
View
2 app/assets/javascripts/toggler.js
@@ -24,7 +24,7 @@ var Toggler = (function() {
},
detailElement: function() {
- return this.link.parent().find(this.detailSelector);
+ return this.$link.parent().find(this.detailSelector);
},
isDetailHidden: function() {

0 comments on commit b7ee00f

Please sign in to comment.