Permalink
Browse files

Merge branch 'section_6_1' into section_6_2

Conflicts:
	app/assets/javascripts/autocompleteSelector.js
  • Loading branch information...
Noel Rappin
Noel Rappin committed Aug 17, 2012
2 parents d9963c1 + 23dbfc2 commit e0aa4a3cbeea44e6a7bafa5710fe1f4f46b7e2d4
Showing with 2 additions and 2 deletions.
  1. +1 −1 app/assets/javascripts/application.js
  2. +1 −1 app/assets/javascripts/toggler.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() {
@@ -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 e0aa4a3

Please sign in to comment.